I too am experiencing this issue. I attempted to apply the patch from commit 7ff18967d7d2e49baa9d80f1b9408b276f3982e0, but it wont apply cleanly to 2.4.31. I was going to apply it by hand, but it appears the last 2 chunks have had a lot of changes in that area of the code.

Is there any chance of getting the patch re-based for 2.4.31?

Thanks