Fixes golang/go#12387

Change-Id: Iecc42d9f809bed10036d1c3af8838c2fbf7ea93d
Reviewed-on: https://go-review.googlesource.com/14014Reviewed-by: David Symonds <dsymonds@golang.org>