This reverts commit da4abda2.

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