Made a bunch of changes, then reverted them all

Ended up with trivial changes