Re-enabling client predicate eval