Revert "Fix HW keys auto disabled in clean installations"

This reverts commit 10b9c828f38bb773e9937c44f0ae213d2c8d69c5.