This reverts commit 3b6abd8a.

Change-Id: I8ca100501c1844af78a547989786d14dac6b494a
Reviewed-on: https://go-review.googlesource.com/93456Reviewed-by: Andrew Bonventre <andybons@golang.org>