Fixes #4124. R=golang-dev, dave, minux.ma, remyoudompheng, rsc CC=golang-dev https://golang.org/cl/6543057
