For golang/go#10743

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