New wip patch attached - applies to git guix...