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