Revert "Stage 3 Design Overhaul"

This reverts commit df6a417bb0002146fd7de5336affc22ee15ca6cb.