Some may recall many moons ago I took some time to try to bring the proxy code changes (code as well as build) from trunk back to 2.2 tree, to help make it easier to backport fixes...
I'd like to float that idea again, before I spend any more time on it...