Revert predicate change, needs more thought