See golang.org/cl/4131 for context. Change-Id: If794246b854f3a26727c0f99633ef295e20f2034 Reviewed-on: https://go-review.googlesource.com/7762 Reviewed-by: David Crawshaw <crawshaw@golang.org>