Revert v2.5