R=golang-dev, r CC=golang-dev https://golang.org/cl/5330068
Fixes #2241 while not breaking issue 1878 again. R=rsc CC=golang-dev https://golang.org/cl/4988048