Related issue golang/go#10150

Change-Id: I38e3e13238624655bb828d501bc865ff8a4312e9
Reviewed-on: https://go-review.googlesource.com/7493Reviewed-by: Alex Brainman <alex.brainman@gmail.com>