Fixes #17982

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