Revert "Fix HW keys auto disabled in clean installations"

This reverts commit aa1844563dd2869b8ba5fa89d1e7d545e3ef53a2.