Revert "Fix hardware keys"

This reverts commit bc01162e2abc0ffddfdc633fea9e520d1f4da226.