rollback of https://golang.org/cl/181077
(broke build)

TBR=dho
https://golang.org/cl/181139
3 files changed