Revert "Used super.XXX instead of manipulating the controller directly in filters"

This reverts commit f59036b58544e6ef5400ee4cf48ec678e659608a.