This reverts commit eb818ae5.

Change-Id: I2034119c7a512c7ceffa72e837e4bed3ff01ed8d
Reviewed-on: https://go-review.googlesource.com/82696Reviewed-by: Mikio Hara <mikioh.mikioh@gmail.com>