This reverts commit a4505e926410cbf20dcd301f35f3496628cad9de. Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf