This reverts commit 9b6c0900. Reason for revert: Should not have passed presubmit. Change-Id: Ie3376a7a1958413f86bf7c81ed98afaf6538e05d
mentioned in commit 5f604bd1