Fixes #4230 (again). R=rsc, golang-dev, r CC=golang-dev https://golang.org/cl/10470043
Fixes #4230. R=golang-dev, rsc CC=golang-dev, remy https://golang.org/cl/6640056