Revert "Fix hardware keys"

This reverts commit 34465d623a9893397d76b87a5c3ab7fd1ce8910d.