Revert "opt_hardware to us"

This reverts commit c20b05be9b213bd629b76fa9a52ab0754f6bdd55.