Revert "Remove remnants of HWC 0.x"

This reverts commit 71b9c1fab92727b1463226681d7bd61aac85291b.