Revert "Fix hardware keys"

This reverts commit 3d387d486dec3aefb59bb6bd55d22f1058298417.