Comment 2 for bug 2013334

I've deployed this to one of our servers and it looks to have successfully resolved the issue. We're leaving it for a while to make sure nothing else breaks, but I should be able to provide an update soon.