Reverting style changes to move to release-2.3 and merge in.