The story is more complicated; this is just a bandaid. R=golang-dev, adg CC=golang-dev https://golang.org/cl/4755047
