Please remove all the indents changes from this PR. That's not something we usually do as it polluted the blame.

Usually you can clean up stuffs that your patch changes.