rollback changes from release preparation of hhf