Revert to old style filters for now, investigate later.

And skip if found in tests

This reverts commit ebb87844.