diff --git a/acme/acme/client.py b/acme/acme/client.py
index e3d909aa1..defa27e7e 100644
--- a/acme/acme/client.py
+++ b/acme/acme/client.py
@@ -570,7 +570,7 @@ class ClientV2(ClientBase):
         :rtype: OrderResource
         """
         csr = OpenSSL.crypto.load_certificate_request(OpenSSL.crypto.FILETYPE_PEM, csr_pem)
-        dnsNames = crypto_util._pyopenssl_cert_or_req_san(csr)
+        dnsNames = crypto_util._pyopenssl_cert_or_req_all_names(csr)
 
         identifiers = []
         for name in dnsNames:
diff --git a/acme/acme/crypto_util.py b/acme/acme/crypto_util.py
index b8fba0348..0931ac14b 100644
--- a/acme/acme/crypto_util.py
+++ b/acme/acme/crypto_util.py
@@ -186,6 +186,16 @@ def make_csr(private_key_pem, domains, must_staple=False):
     return OpenSSL.crypto.dump_certificate_request(
         OpenSSL.crypto.FILETYPE_PEM, csr)
 
+def _pyopenssl_cert_or_req_all_names(loaded_cert_or_req):
+    common_name = loaded_cert_or_req.get_subject().CN
+    # pylint: disable=protected-access
+    sans = _pyopenssl_cert_or_req_san(loaded_cert_or_req)
+
+    if common_name is None:
+        return sans
+    else:
+        return [common_name] + [d for d in sans if d != common_name]
+
 def _pyopenssl_cert_or_req_san(cert_or_req):
     """Get Subject Alternative Names from certificate or CSR using pyOpenSSL.
 
diff --git a/certbot/crypto_util.py b/certbot/crypto_util.py
index 3ae16529d..2d12b7b35 100644
--- a/certbot/crypto_util.py
+++ b/certbot/crypto_util.py
@@ -340,14 +340,7 @@ def _get_names_from_cert_or_req(cert_or_req, load_func, typ):
 
 
 def _get_names_from_loaded_cert_or_req(loaded_cert_or_req):
-    common_name = loaded_cert_or_req.get_subject().CN
-    # pylint: disable=protected-access
-    sans = acme_crypto_util._pyopenssl_cert_or_req_san(loaded_cert_or_req)
-
-    if common_name is None:
-        return sans
-    else:
-        return [common_name] + [d for d in sans if d != common_name]
+    return acme_crypto_util._pyopenssl_cert_or_req_all_names(loaded_cert_or_req)
 
 
 def get_names_from_cert(csr, typ=OpenSSL.crypto.FILETYPE_PEM):