This reverts commit 7d14401b.

Reason for revert: Doesn't build.

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