Fixes #15607.

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