Maybe avoid reformatting this piece of code if nothing was really changed here.
I think we plan to do a big clean up, but otherwise this makes merging other pull requests harder.