This reverts commit 3d86d45d.

Reason for revert: Fixing a different way. See #20008.

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