Fixes https://golang.org/cl/5480060/#msg4 R=golang-dev, r CC=golang-dev https://golang.org/cl/5485051
