diff --git a/ChangeLog b/ChangeLog
index 8e1434a..9f97da7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@
    * Fix potential memory leak in ssl_set_psk() (found by Mansour Moufid).
 
 Changes
+   * ssl_set_own_cert() now longers calls pk_check_pair() since the
+     performance impact was bad for some users (this was introduced in 1.3.10).
    * Move from SHA-1 to SHA-256 in example programs using signatures
      (suggested by Thorsten Mühlfelder).
    * Remove some unneeded inclusions of header files from the standard library
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d83ec74..77bb9ad 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3973,7 +3973,7 @@
     key_cert->cert = own_cert;
     key_cert->key  = pk_key;
 
-    return( pk_check_pair( &key_cert->cert->pk, key_cert->key ) );
+    return( 0 );
 }
 
 #if defined(POLARSSL_RSA_C)
@@ -4002,7 +4002,7 @@
     key_cert->cert = own_cert;
     key_cert->key_own_alloc = 1;
 
-    return( pk_check_pair( &key_cert->cert->pk, key_cert->key ) );
+    return( 0 );
 }
 #endif /* POLARSSL_RSA_C */
 
@@ -4031,7 +4031,7 @@
     key_cert->cert = own_cert;
     key_cert->key_own_alloc = 1;
 
-    return( pk_check_pair( &key_cert->cert->pk, key_cert->key ) );
+    return( 0 );
 }
 #endif /* POLARSSL_X509_CRT_PARSE_C */