Revert "Intelligent filtering"

This reverts commit d93ce571d3f0e1d1cf7781c81e42b729f57e1bc9.