This reverts commit c6e69ec7.

Reason for revert: Broke builders. #24508

Change-Id: I66abff0dd14ec6e1f8d8d982ccfb0438633b639d
Reviewed-on: https://go-review.googlesource.com/102316Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>