Fixes #7547 LGTM=iant R=iant, khr CC=golang-codereviews https://golang.org/cl/84470046
Attach a file by drag & drop or click to upload