diff --git a/patches/winex11-MWM_Decorations/0001-winex11.drv-Don-t-use-MWM_DECOR_RESIZEH-window-resiz.patch b/patches/winex11-MWM_Decorations/0001-winex11.drv-Don-t-use-MWM_DECOR_RESIZEH-window-resiz.patch
deleted file mode 100644
index 7b1e15b0..00000000
--- a/patches/winex11-MWM_Decorations/0001-winex11.drv-Don-t-use-MWM_DECOR_RESIZEH-window-resiz.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0c3d48134adbb00dcbb561ae920fcf9f4c58fc0f Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 30 Dec 2016 12:40:21 +0800
-Subject: winex11.drv: Don't use MWM_DECOR_RESIZEH, window resizing is
- controlled by MWM_FUNC_RESIZE.
-
-This patch fixes double caption observed under some WMs (Metacity,
-its successor Mate, and XFCE).
----
- dlls/winex11.drv/window.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
-index 7408a0eb480..08856422bb7 100644
---- a/dlls/winex11.drv/window.c
-+++ b/dlls/winex11.drv/window.c
-@@ -279,7 +279,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
-         if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE;
-     }
-     if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER;
--    else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH;
-+    else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER;
-     else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER;
-     return ret;
- }
--- 
-2.11.0
-
diff --git a/patches/winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch b/patches/winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch
deleted file mode 100644
index 039ae454..00000000
--- a/patches/winex11-MWM_Decorations/0002-winex11.drv-Don-t-add-MWM_DECOR_BORDER-to-windows-wi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d2f3b7e3a70a64665ad77b7b2a97f3c7ea9425db Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 20 Jan 2017 17:08:19 +0800
-Subject: winex11.drv: Don't add MWM_DECOR_BORDER to windows without a caption.
-
-XFCE4 always treats such windows as requesting the caption decoration.
----
- dlls/winex11.drv/window.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
-index 0fc36dc3c6d..af641c76eb1 100644
---- a/dlls/winex11.drv/window.c
-+++ b/dlls/winex11.drv/window.c
-@@ -278,9 +278,6 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
-         if (style & WS_MINIMIZEBOX) ret |= MWM_DECOR_MINIMIZE;
-         if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE;
-     }
--    if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER;
--    else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER;
--    else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER;
-     return ret;
- }
- 
--- 
-2.11.0
-
diff --git a/patches/winex11-MWM_Decorations/definition b/patches/winex11-MWM_Decorations/definition
deleted file mode 100644
index e29a0428..00000000
--- a/patches/winex11-MWM_Decorations/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: [42117] Avoid double captions observed under some WMs
diff --git a/staging/upstream-commit b/staging/upstream-commit
index e1a8ad92..34e04109 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-6298b0cab2086ae61f46b284d22c420dfbb2b44e
+e66405a5040ac233ebdc7bdd925919ad63b4dd69