Revert "Merge pull request #964 from dimagi/filter-fixin"

This reverts commit 974821f06588b4d4dcf4dcd9d6e16242406586c9, reversing
changes made to 687859e720c161c57fcd81f6346704f2b86e3743.
Merge pull request #970 from dimagi/oopsie-daisies

Revert "Merge pull request #964 from dimagi/filter-fixin"
pull master