Fixes #18562

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