Revert from master-2.5 and then recommitted