CLC-2300 Roll back the changes for today's aborted release

https://jira.media.berkeley.edu/jira/browse/CLC-2300

When @ctweney returns, he may prefer some other way of undoing this, but I think we need to find out quickly whether these changes were responsible for QA breakage.