Fixes #15364.

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