Fixes #10224

Change-Id: I21037379b4667575e51ab0b6b683138c505c3f68
Reviewed-on: https://go-review.googlesource.com/7960Reviewed-by: David Crawshaw <crawshaw@golang.org>