diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
index a677adfd648..d74e6c7f981 100644
--- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
+++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
@@ -1616,13 +1616,14 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
      *
      * See Part 1 of this hack below.
      */
+#if 0
     if (GuiData->HackCORE8394IgnoreNextMove && msg == WM_MOUSEMOVE)
     {
         GuiData->HackCORE8394IgnoreNextMove = FALSE;
         goto Quit;
     }
     GuiData->HackCORE8394IgnoreNextMove = FALSE;
-
+#endif
     // FIXME: It's here that we need to check whether we have focus or not
     // and whether we are or not in edit mode, in order to know if we need
     // to deal with the mouse.
@@ -1803,7 +1804,7 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
             case WM_MBUTTONDOWN:
             case WM_RBUTTONDOWN:
             case WM_XBUTTONDOWN:
-                GuiData->HackCORE8394IgnoreNextMove = TRUE;
+//                GuiData->HackCORE8394IgnoreNextMove = TRUE;
             default:
                 break;
         }
@@ -1964,7 +1965,7 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
             case WM_MBUTTONDOWN:
             case WM_RBUTTONDOWN:
             case WM_XBUTTONDOWN:
-                GuiData->HackCORE8394IgnoreNextMove = TRUE;
+//                GuiData->HackCORE8394IgnoreNextMove = TRUE;
             default:
                 break;
         }
diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h
index f6c20f2067f..9183d51b74d 100644
--- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h
+++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h
@@ -72,7 +72,7 @@ typedef struct _GUI_CONSOLE_DATA
     INT  MouseCursorRefCount;   /* The reference counter associated with the mouse cursor. >= 0 and the cursor is shown; < 0 and the cursor is hidden. */
     BOOL IgnoreNextMouseEvent;  /* Used when we need to not process a mouse event */
 
-    BOOL HackCORE8394IgnoreNextMove; /* HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */
+//    BOOL HackCORE8394IgnoreNextMove; /* HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */
 
     HMENU hSysMenu;             /* Handle to the console window system menu */
     BOOL IsCloseButtonEnabled;  /* TRUE if the Close button and the corresponding system menu item are enabled (default), FALSE otherwise */
diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
index 5b9cf9d8cdc..fffee0cc5e4 100644
--- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
+++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
@@ -533,7 +533,7 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
     /* A priori don't ignore mouse events */
     GuiData->IgnoreNextMouseEvent = FALSE;
     /* Initialize HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */
-    GuiData->HackCORE8394IgnoreNextMove = FALSE;
+//    GuiData->HackCORE8394IgnoreNextMove = FALSE;
 
     /* Close button and the corresponding system menu item are enabled by default */
     GuiData->IsCloseButtonEnabled = TRUE;