Revert "Fix hardware keys"

This reverts commit 5820540e03b778a278a2ff75e8d2bd7900f5a37e.