Fixes #25599

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