Due to my rookie mistake this patch isn't necessary anymore inupstream version. The issue was already resolved in a differentmanner.Apologies for inconvenience.