This reverts commit 3e6b7f35.

Change-Id: Icad2b235b9880729fbdf80d7dfd71e56df4b1231
Reviewed-on: https://go-review.googlesource.com/8944Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>