Plucked from the e86e5f846 which got reverted. Change-Id: I4bba3f3c31c5181867378ae174537429b49a50df
e86e5f846