(Speculative fix---I can't test it directly.) LGTM=gri R=gri CC=golang-codereviews https://golang.org/cl/89320043