Revert "Lots o' changes"

This reverts commit b280f54186d58f17332c7d68bd3c2adf871e7f74.