rollback changes from release preparation of branch_suresh