Revert "Rewrite filter in terms of filter!"

This reverts commit 38a0b410b5c7fd8baa6fad975f47308073bf70a7.