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