diff --git a/gdm-quit-plymouth-on-headless.patch b/gdm-quit-plymouth-on-headless.patch
deleted file mode 100644
index fa0a1a2..0000000
--- a/gdm-quit-plymouth-on-headless.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0f97c73ef56df6d7cc5d582d9f984ba1e697c734 Mon Sep 17 00:00:00 2001
-From: Felix Zhang <fezhang@suse.com>
-Date: Mon, 23 Apr 2018 15:01:45 +0800
-Subject: [PATCH] manager: always quit plymouth on a managed display, in a
- lapsed time
-
-When booting up gdm without monitor, the display is marked as
-managed but never gets a connected session client afterwards,
-causing all the depending systemd targets to hang waiting plymouth
-to quit.
-
-This commit kind of reverts commit 2cbd7ad, to always quit plymouth
-when a display is managed, but adding a timeout to get around the
-issue fixed by commit 2cbd7ad1.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=795477
----
- daemon/gdm-manager.c | 22 ++++++----------------
- 1 file changed, 6 insertions(+), 16 deletions(-)
-
-diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index 7539acf1..24b90301 100644
---- a/daemon/gdm-manager.c
-+++ b/daemon/gdm-manager.c
-@@ -1673,6 +1673,12 @@ on_display_status_changed (GdmDisplay *display,
-                         }
- 
-                         if (status == GDM_DISPLAY_MANAGED) {
-+#ifdef WITH_PLYMOUTH
-+                                if (quit_plymouth) {
-+                                        g_timeout_add_seconds (20, (GSourceFunc) plymouth_quit_with_transition, NULL);
-+                                        manager->priv->plymouth_is_running = FALSE;
-+                                }
-+#endif
-                                 greeter_display_started (manager, display);
-                         }
-                         break;
-@@ -1954,15 +1960,6 @@ on_user_session_started (GdmSession      *session,
- {
-         g_debug ("GdmManager: session started %d", pid);
-         add_session_record (manager, session, pid, SESSION_RECORD_LOGIN);
--
--#ifdef WITH_PLYMOUTH
--        if (g_strcmp0 (service_name, "gdm-autologin") == 0) {
--                if (manager->priv->plymouth_is_running) {
--                        g_timeout_add_seconds (20, (GSourceFunc) plymouth_quit_with_transition, NULL);
--                        manager->priv->plymouth_is_running = FALSE;
--                }
--        }
--#endif
- }
- 
- static void
-@@ -2116,13 +2113,6 @@ on_session_client_connected (GdmSession      *session,
-                 return;
-         }
- 
--#ifdef WITH_PLYMOUTH
--        if (manager->priv->plymouth_is_running) {
--                plymouth_quit_with_transition ();
--                manager->priv->plymouth_is_running = FALSE;
--        }
--#endif
--
-         g_object_get (G_OBJECT (display), "allow-timed-login", &allow_timed_login, NULL);
- 
-         if (!allow_timed_login) {
--- 
-2.13.6
-
diff --git a/gdm.changes b/gdm.changes
index dea69f4..da738fa 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  3 04:52:13 UTC 2018 - fezhang@suse.com
+
+- Drop gdm-quit-plymouth-on-headless.patch: Patch is known to cause
+  the first login to fail, a reworked patch needed.
+
 -------------------------------------------------------------------
 Mon Apr 23 07:59:36 UTC 2018 - fezhang@suse.com
 
diff --git a/gdm.spec b/gdm.spec
index e2f3887..236fd17 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -57,8 +57,6 @@ Patch41:        gdm-plymouth-vt1.patch
 Patch42:        gdm-fails-to-restart-gnome-shell.patch
 # PATCH-FIX-UPSTREAM gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 msrb@suse.com -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present.
 Patch43:        gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
-# PATCH-FIX-UPSTREAM gdm-quit-plymouth-on-headless.patch boo#1089673 bgo#795477 fezhang@suse.com -- Quit plymouth whenever a display is managed, to avoid system without monitor hanging.
-Patch44:        gdm-quit-plymouth-on-headless.patch
 ### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
 # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
 Patch1002:      gdm-disable-gnome-initial-setup.patch
@@ -202,7 +200,6 @@ cp %{SOURCE8} .
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
-%patch44 -p1
 # SLE-only patches start at 1000
 %if !0%{?is_opensuse}
 %patch1002 -p1