Thanks to avadh4all for spotting it. Fixes #1214. R=r, r2 CC=golang-dev https://golang.org/cl/2616041
