rollback changes from release preparation of non1