diff --git a/Misc/NEWS.d/next/Build/2019-04-06-18-53-03.bpo-36544.hJr2_a.rst b/Misc/NEWS.d/next/Build/2019-04-06-18-53-03.bpo-36544.hJr2_a.rst
new file mode 100644
index 000000000000000..71f5c21847b6964
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2019-04-06-18-53-03.bpo-36544.hJr2_a.rst
@@ -0,0 +1 @@
+Fix regression introduced in bpo-36146 refactoring setup.py
diff --git a/setup.py b/setup.py
index c278f08b8e6d2f4..7c9ed0d6c560288 100644
--- a/setup.py
+++ b/setup.py
@@ -1642,6 +1642,7 @@ def detect_modules(self):
         self.detect_crypt()
         self.detect_socket()
         self.detect_openssl_hashlib()
+        self.detect_hash_builtins()
         self.detect_dbm_gdbm()
         self.detect_sqlite()
         self.detect_platform_specific_exts()
@@ -2187,6 +2188,7 @@ def split_var(name, sep):
                            library_dirs=openssl_libdirs,
                            libraries=openssl_libs))
 
+    def detect_hash_builtins(self):
         # We always compile these even when OpenSSL is available (issue #14693).
         # It's harmless and the object code is tiny (40-50 KiB per module,
         # only loaded when actually used).