Fixes #6850. LGTM=agl R=golang-codereviews, agl CC=golang-codereviews https://golang.org/cl/60500046
Attach a file by drag & drop or click to upload
