Revert "hcrypto: avoid key_type redefinition"