Fixes #4429. R=golang-dev, remyoudompheng, daniel.morsing, rsc CC=golang-dev https://golang.org/cl/6850097