diff -r c2e898813409 Python/import.c
--- a/Python/import.c	Thu Jun 30 10:34:52 2016 +0300
+++ b/Python/import.c	Thu Jun 30 11:24:29 2016 +0300
@@ -1451,6 +1451,7 @@ PyImport_ImportModuleLevelObject(PyObjec
             }
         }
         else {
+            package = NULL;
             if (PyErr_WarnEx(PyExc_ImportWarning,
                         "can't resolve package from __spec__ or __package__, "
                         "falling back on __name__ and __path__", 1) < 0) {
@@ -1555,15 +1556,10 @@ PyImport_ImportModuleLevelObject(PyObjec
     _PyImport_AcquireLock();
 #endif
    /* From this point forward, goto error_with_unlock! */
-    if (PyDict_Check(globals)) {
-        builtins_import = _PyDict_GetItemId(globals, &PyId___import__);
-    }
+    builtins_import = _PyDict_GetItemId(interp->builtins_copy, &PyId___import__);
     if (builtins_import == NULL) {
-        builtins_import = _PyDict_GetItemId(interp->builtins, &PyId___import__);
-        if (builtins_import == NULL) {
-            PyErr_SetString(PyExc_ImportError, "__import__ not found");
-            goto error_with_unlock;
-        }
+        PyErr_SetString(PyExc_ImportError, "__import__ not found");
+        goto error_with_unlock;
     }
     Py_INCREF(builtins_import);