Fixes #4252. R=rsc, golang-dev, mirtchovski, daniel.morsing, dave, lvd CC=golang-dev https://golang.org/cl/6856126