Fixes #19511

Change-Id: I5585726773b822dba0be0196961132323ebbe084
Reviewed-on: https://go-review.googlesource.com/53071Reviewed-by: Chris Broadfoot <cbro@golang.org>