revert to standard lineup: 2.4.x 3.0.x, 3.1.x