Fixes #15188

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