Can you share your patches? I'm still using 52esr in some very limited contexts and an upgrade would be great
But here is the important bit regardless: https://gist.github.com/formerextensiondev/50f3ebf563048e75f...
And even back then I was too lazy to actually properly "fix" it as you can see.