This reverts commit c1ad524a. Reason for revert: Broke presubmits? Change-Id: I8a4e7262e002c6494422430471df1ab65f5bc198