Reverting these things, whitespace, and a few other things...