Fixes #4205 (again). R=r, 0xjnml CC=golang-dev https://golang.org/cl/6819082
Attach a file by drag & drop or click to upload
