Fixes #22554

Change-Id: I624f2883489a46d7162c11f489c2f0a0ec5a836f
Reviewed-on: https://go-review.googlesource.com/86277Reviewed-by: Ian Lance Taylor <iant@golang.org>