There were 2 TODOs about that fix after Golang 1.8 release.
It's here for 3 years already, so now should be the right time.