Index: gdm-40.0/daemon/gdm-display.c
===================================================================
--- gdm-40.0.orig/daemon/gdm-display.c
+++ gdm-40.0/daemon/gdm-display.c
@@ -570,7 +570,7 @@ gdm_display_prepare (GdmDisplay *self)
                 exit (EXIT_FAILURE);
         }
 
-        priv->doing_initial_setup = wants_initial_setup (self);
+        priv->doing_initial_setup = FALSE;
 
         g_object_ref (self);
         ret = GDM_DISPLAY_GET_CLASS (self)->prepare (self);
@@ -1509,6 +1509,7 @@ on_launch_environment_session_died (GdmL
         self_destruct (self);
 }
 
+#if 0
 static gboolean
 can_create_environment (const char *session_id)
 {
@@ -1660,6 +1661,7 @@ wants_initial_setup (GdmDisplay *self)
 
         return enabled;
 }
+#endif
 
 void
 gdm_display_start_greeter_session (GdmDisplay *self)
Index: gdm-40.0/data/gdm.schemas.in
===================================================================
--- gdm-40.0.orig/data/gdm.schemas.in
+++ gdm-40.0/data/gdm.schemas.in
@@ -50,7 +50,7 @@
     <schema>
       <key>daemon/InitialSetupEnable</key>
       <signature>b</signature>
-      <default>true</default>
+      <default>false</default>
     </schema>
     <schema>
       <key>daemon/WaylandEnable</key>