Fixes #20618

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