This reverts commit b744a11a.

Reason for revert: Broke trybots. (misc-vetall builder is busted)

Change-Id: I651d1c18db2fb3cb6ec12c2ae62024627baf8d77
Reviewed-on: https://go-review.googlesource.com/38332Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>