Revert "Revert "2.5""

This reverts commit a7d988685de406808460e18c92a502a0d4d59589.