Fixes #20294

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