This reverts commit 6a3d4be3.

Reason for revert: breaks various builds. See comments on CL 77670

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