Fixes #2454. R=rsc, mikioh.mikioh, golang-dev, iant, iant CC=golang-dev https://golang.org/cl/5557068