Fixes #21089

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