Fixes #10236

Change-Id: Ife85513efda48af81c267b753da2ac7317cdfe75
Reviewed-on: https://go-review.googlesource.com/11479Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>