(Resurrecting 3082b4a5 which was lost in b9cc48a4) Change-Id: I0868e7fbb944aa48a4ef29880fb0cc5faa51c2e7