Fixes #21043

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