This reverts commit e4819a1b, reversing changes made to b6ec41ca. Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
