This reverts commit c5bafc82.

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