Fixes #9605

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