Removed stylistic changes

Now it's much easier to find what was changed between upstream and our
repo.