This reverts commit a0df0836.

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