Remove predicate workaround, we're going to require that predicate