Revert changes from lists branch to fix the staging site
This reverts commit afb36ef8, reversing changes made to ecd05e31.