Update #8725 LGTM=rsc, josharian R=rsc, josharian CC=golang-codereviews https://golang.org/cl/149000043
