I tried this patch and it works on my side. As you mentioned it's not perfect but it's the same as before the regression. So it solves the regression.