Revert "A whole shit-ton of changes."

This reverts commit 39b9fb86c5bd2d881c62b143017b5741045c9877.