[release-branch.go1.3] undo 941ef9ddbada / 125150044

It broke the build across all platforms.
The original change wasn't even reviewed.
Probably should never have been ported to this branch.

LGTM=r
R=r
CC=golang-codereviews
https://codereview.appspot.com/128130043