Fixes #20383

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