Revert "Fix hardware keys"

This reverts commit a52c8157a9ee735ca9ba53145f34639dd21c4666.