Thanks! That's tempting to drop the patch and just stay with the upstream.