Fixes #24480

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