Fixes #7075

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