Fix broken build that was broke by "fix[ing] broken build" Beaking change: http://golang.org/cl/13970 Reverting to state after http://golang/org/cl/12774 Change-Id: Ibb054467ca374d1f9ccff0ec1874a3e567d0c325 Reviewed-on: https://go-review.googlesource.com/16021 Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>