rollback changes from release preparation of 2525