Revert clang-formatted stuff