Fixes #9284

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