Fix: Manually revert removal of PredicateRewriter

Cannot yet kill it since we don't have a place for predicates for MERGE in the new ast