Revert d369cbb7d42232f785f51b3ef4c8b994dae83486

See https://github.com/golang/go/issues/9356