Revert "Lots of changes!"

This reverts commit 9793743fcb100bdd1289dad60dd51f40d89bbc5c.