I have submitted a patch in https://go-review.googlesource.com/#/c/24880/ and https://go-review.googlesource.com/#/c/24881/ (it straddles two repositories, I'm not sure what the correct way to propose this change is).