Revert "Merge branch 'staging' of /Users/brian/code/code-dot-org with conflicts."

This reverts commit 25dc6f7e0db83bb04267e76bd73583d9918f885f.