diff --git a/crypto/evp/evp.c b/crypto/evp/evp.c
index 9ccf2b7..3eefb52 100644
--- a/crypto/evp/evp.c
+++ b/crypto/evp/evp.c
@@ -227,11 +227,9 @@
 }
 
 int EVP_PKEY_type(int nid) {
-  const EVP_PKEY_ASN1_METHOD *meth = evp_pkey_asn1_find(nid);
-  if (meth == NULL) {
-    return NID_undef;
-  }
-  return meth->pkey_id;
+  // In OpenSSL, this was used to map between type aliases. BoringSSL supports
+  // no type aliases, so this function is just the identity.
+  return nid;
 }
 
 DH *EVP_PKEY_get0_DH(const EVP_PKEY *pkey) { return NULL; }
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 8a9d620..93b2eb3 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -136,10 +136,6 @@
 // values.
 OPENSSL_EXPORT int EVP_PKEY_id(const EVP_PKEY *pkey);
 
-// EVP_PKEY_type returns |nid| if |nid| is a known key type and |NID_undef|
-// otherwise.
-OPENSSL_EXPORT int EVP_PKEY_type(int nid);
-
 
 // Getting and setting concrete public key types.
 //
@@ -1036,6 +1032,9 @@
 // Use the |EVP_PKEY_assign_*| functions instead.
 OPENSSL_EXPORT int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
 
+// EVP_PKEY_type returns |nid|.
+OPENSSL_EXPORT int EVP_PKEY_type(int nid);
+
 
 // Preprocessor compatibility section (hidden).
 //