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