This reverts commit def3280e.

Reason for revert: broke the vetall builder and I (Brad) forgot to run the trybots first. :(

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