Fixes #18135

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