Revert "Remove remnants of HWC 0.x"