Revert "Merge conditions with $and"

This reverts commit e020f8a51172cf3a285daee1388eb789b1566d96.