This reverts commit bb8c2e19.

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