rollback changes from release preparation of Branch-2