Also removes unnecessary build tag. R=dave CC=golang-dev https://golang.org/cl/21270043
Attach a file by drag & drop or click to upload
