Related to #25477.

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