This reverts commit 7db77271.

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