See golang.org/cl/4131 for context.

Change-Id: I474d4d455ad0207bf6cea6c36fc8bdcea3405b47
Reviewed-on: https://go-review.googlesource.com/7726


Reviewed-by: David Crawshaw <crawshaw@golang.org>