Revert "Merge branch 'named-filter-forms'"

This reverts commit 323405e617f7d2b0aaa854762309d5437c42fbb9, reversing
changes made to 41a68ddeb3b9e38dd1a2442f5ca23568d737b5b0.