Unfortunately that fix is wrong (as you pointed out - the tests), I have one that works now, it may not be ideal but I'm sure someone who knows their cgo will be able to improve. It will be on Phabricator.