Fixes #25330

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