Revert "Merging from staging.Merge branch 'master' of heroku.com:pop-up-archive-staging"

This reverts commit 256180c2c19259fdd9bd6fec26f00822732acaf4, reversing
changes made to ba2ae6fe4152c58dd5df2e064d5e81370669347d.