--- GConf-2.23.2/gconf/gconftool.c	2008-06-28 10:27:33.000000000 +0100
+++ GConf-2.22.0/gconf/gconftool.c	2008-01-08 14:30:06.000000000 +0000
@@ -891,27 +890,7 @@
     }
 
   if (config_source == NULL)
-    {
-        /* If we aren't running from within a session,
-         * assume we'll be touching the database locally
-         */
-      conf = NULL;
-      if (g_getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL)
-        {
-          char *conffile;
-          GSList *addresses;
-
-          conffile = g_strconcat (GCONF_CONFDIR, "/path", NULL);
-          addresses = gconf_load_source_path (conffile, NULL);
-          g_free(conffile);
-
-          conf = gconf_engine_get_local_for_addresses (addresses, &err);
-          gconf_address_list_free (addresses);
-        }
-
-      if (conf == NULL)
-        conf = gconf_engine_get_default();
-    }
+    conf = gconf_engine_get_default();
   else
     {
       GSList *addresses;