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