Revert "Pipelined filter.v a bit"

This reverts commit 75769c53100181ce8273f44a8a3998fe9f10dfa5.