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