Revert "Convert boolean translations to strict cql"

This reverts commit e88584dff984ea3dae08ab41556910ae2ce0ef32.