This should make CL 5431046 a little simpler. R=ken2 CC=golang-dev https://golang.org/cl/5444048
Attach a file by drag & drop or click to upload
