Results 122 comments of Vedran Pavic

That's certainly possible, but rather than adding workarounds IMO it's wiser to skip the upgrade to 2.5.0 altogether and instead wait for the release that will fix this regression.