Created attachment 77490 [details] [review] Proposed patch Does this patch solve the big regression ?