Revert "remove hw class flag"

This reverts commit a56fc7fff2e33949849dc22b1e789eda4c71b131.