Revert "Lots of changes!"

This reverts commit 79905d785cf3bf7f40772f3106be82ad51d2e8e1.