Reverting formatting differences from upstream