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