Revert "Fix hardware keys"

This reverts commit cb1fc05b125788c703aed41a4475bf930d25ecb4.