diff -urp gdm-3.33.90.orig/daemon/gdm-display.c gdm-3.33.90/daemon/gdm-display.c
--- gdm-3.33.90.orig/daemon/gdm-display.c	2019-08-02 14:44:35.000000000 -0500
+++ gdm-3.33.90/daemon/gdm-display.c	2019-08-31 21:53:53.968826727 -0500
@@ -570,7 +570,7 @@ gdm_display_prepare (GdmDisplay *self)
          */
         look_for_existing_users_sync (self);
 
-        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)
 {
@@ -1522,9 +1523,11 @@ can_create_environment (const char *sess
 
         return session_exists;
 }
+#endif
 
 #define ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT GDM_RUN_DIR "/gdm.ran-initial-setup"
 
+#if 0
 static gboolean
 already_done_initial_setup_on_this_boot (void)
 {
@@ -1660,6 +1663,7 @@ wants_initial_setup (GdmDisplay *self)
 
         return enabled;
 }
+#endif
 
 void
 gdm_display_start_greeter_session (GdmDisplay *self)
diff -urp gdm-3.33.90.orig/data/gdm.schemas.in gdm-3.33.90/data/gdm.schemas.in
--- gdm-3.33.90.orig/data/gdm.schemas.in	2019-08-02 14:44:36.000000000 -0500
+++ gdm-3.33.90/data/gdm.schemas.in	2019-08-31 21:54:38.225061313 -0500
@@ -50,7 +50,7 @@
     <schema>
       <key>daemon/InitialSetupEnable</key>
       <signature>b</signature>
-      <default>true</default>
+      <default>false</default>
     </schema>
     <schema>
       <key>daemon/WaylandEnable</key>