rollback changes from release preparation of dfgh