This reverts commit d7da3147. Reason for revert: Tests are still failing on the buildbot. Change-Id: Iaaac38137b1c4bed8e3a15b0c0c14730654025f6