Fixes #13474

Change-Id: Ic86e54f6bc67db46504f7d43a0666647af308177
Reviewed-on: https://go-review.googlesource.com/17404Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>