Revert "Fix hardware keys"

This reverts commit b7011ce9e147b34eba1d39e7d712264e1ffdaba1.