rollback changes from release preparation of syedgh