More formatting reversions to minimize noise in pull request.