See golang.org/cl/4131 for context.

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