Yep. We are in exactly the same situation. Even moving to 2.4 looks to be a pain. The only brightside is that it's not THAT big of a framework, so patching it is not too bad. But still...