Fixes #9445

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