Fixes #13660

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