Thanks kballard for the hint. Fixes #4857. R=golang-dev, iant CC=golang-dev https://golang.org/cl/9649045