Fixes #18675

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