Reverted to upstream spacing conventions

Using file from upstream so we don't generate unnecessary diffs.