You don't seem to have referenced this issue in your post, although you are obviously aware of it, having contributed.

This entire problem seems to be an unholy mess arising from good intentions less-than-perfectly executed. I don't know how you got to here with your codebase but now might be a good time to write some tests and then factor out one or other of these apparently incompatible modules. Good luck.