This reverts commit 502bc0b59f. Now that we have two space indent, astyle does the right thing
502bc0b59f