This reverts commit a855da29.

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