Fixes #6323. LGTM=r R=r CC=golang-codereviews https://golang.org/cl/56870043
Attach a file by drag & drop or click to upload
