Fixes #12244

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