diff --git a/src/thread/windows/SDL_systhread.c b/src/thread/windows/SDL_systhread.c
index 4386e841f..06e23abd0 100644
--- a/src/thread/windows/SDL_systhread.c
+++ b/src/thread/windows/SDL_systhread.c
@@ -145,6 +145,7 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
     return 0;
 }
 
+#if 0  /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */
 #ifdef _MSC_VER
 #pragma warning(disable : 4733)
 #pragma pack(push,8)
@@ -163,11 +164,13 @@ ignore_exception(void *a, void *b, void *c, void *d)
     return ExceptionContinueExecution;
 }
 #endif
+#endif
 
 void
 SDL_SYS_SetupThread(const char *name)
 {
     if (name != NULL) {
+        #if 0 /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */
         #if (defined(_MSC_VER) && defined(_M_IX86))
         /* This magic tells the debugger to name a thread if it's listening.
             The inline asm sets up SEH (__try/__except) without C runtime
@@ -196,6 +199,7 @@ SDL_SYS_SetupThread(const char *name)
             add esp, 8
         }
         #endif
+        #endif
     }
 }