Fixes #15559

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