Revert "Update 2.5"

This reverts commit fd320098a888f72bb1789039e98348da9397645f.