Revert "Ensure predicates are applied during matching"

This reverts commit 8e1ee57d1a1026dc660e05e1e5061ee0124c2fea and 4c42b3ab3c6a6f18dee83c2eb0db66310983b050.
Further discussion of this change is required.