Basically undo last commit, but with some tidy-up.