Revert "fix a mistake get hw keys working"

This reverts commit 10e498cd687b46b259ec495c5da32bf09ed23ec1.