mcdonc got a few lines wrong while merging.

lib/python/Zope/Startup/run.py

@@ -28,9 +28,6 @@ def configure(configfile):
     configure('/path/to/configfile'); import Zope; app = Zope.app() """
     import Zope.Startup
     starter = Zope.Startup.get_starter()
-    if not configfile:
-        import os
-        configfile = os.getenv("ZOPE_CONFIG")
     opts = _setconfig(configfile)
     starter.setConfiguration(opts.configroot)
     starter.setupSecurityOptions()

lib/python/Zope/__init__.py

@@ -33,6 +33,8 @@
 # old behavior is likely to cause problems as ZODB backends, like ZEO,
 # gain new features.
 
+from Zope.Startup.run import configure
+
 _began_startup = 0
 
 def startup():
@@ -62,8 +64,6 @@ def debug(*args, **kw):
     import ZPublisher
     return ZPublisher.test('Zope', *args, **kw)
 
-from Zope.Startup.run import configure
-
 # Zope.App.startup.startup() sets the following variables in this module.
 DB = None
 bobo_application = None