This reverts commit e9622ce93a. Landing before presubmits have completed to unblock the build.
e9622ce93a