Revert "Fix a derp"

This reverts commit bacc79e58c1cc96e7bfa33f0c2795eb2f3cf036e.
Revert "Commotio - Re-add some Day 1 changes"

This reverts commit 83266c425b0995d70110e05a9ddcf5eb9ba633ab.