This reverts commit a677724e.

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