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