Revert "Stage 2 Design Overhaul"

This reverts commit a75c0a78b279a48a9a5fce372d228fd33cb83e63.