Fixes #7760. LGTM=iant R=iant, remyoudompheng CC=golang-codereviews https://golang.org/cl/130720043
Attach a file by drag & drop or click to upload
