Revert "CQL: accept relations "within", "encloses""