revert 'Hardware Keys: cleanup'

Signed-off-by: travp624 <travp624@gmail.com> (reverse-merged from commit 3aa6ab3cdb0ebae3dac27af1483300e543166362)