Can you try and encourage upstream to merge this patch?