Built on top of a failing change. This reverts commit b4e51ebf. Change-Id: I7f4dbe22271a9c04e518bceabba12c95cad3c6f7