This caused more problems than it was worth.

Fixes #4301.
Fixes #4317.

R=golang-dev, minux.ma, rsc
CC=golang-dev
https://golang.org/cl/6818076