The previous patch was merged against a different version of Go, plus had bugs. Now given I am able to build stuff, this seems to do the right job.