This reverts commit 66889b87, reversing
changes made to 0dd9c24e.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.