Did you find a solution to this problem? I've just come up against the same thing. I'd prefer not to have to rewrite lots of old code just now.