Fixes #6723. R=rsc CC=golang-codereviews https://golang.org/cl/41570047
Update #4139. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/6609051