Reverting logic filter equality optimizations, they are breaking the build in the CQL module