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