Fixes #22292

Change-Id: I016e5f2b8624a6ebaf11a693a0f6d94d7b0d3f92
Reviewed-on: https://go-review.googlesource.com/71550Reviewed-by: Daniel Theophanes <kardianos@gmail.com>