This reverts commit 2620ac3a.

Reason for revert: broke all the builds.

Change-Id: I26fc09a13f5f80fa708de66c843442ff9d934694
Reviewed-on: https://go-review.googlesource.com/73050Reviewed-by: Russ Cox <rsc@golang.org>