Fixes #24580

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