This reverts commit 5c0ad186.

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