Revert "Began super refactory."

This reverts commit 172144be0fabea6c6fdc89d5ad17f6efaef140a0.