Revert "Stage 1 Design Overhaul"

This reverts commit 4d9929a03a64a21507d9202bb0cce2f753b102f4.