rollback changes from release preparation of hjk