2.3.x revert and new release commit