diff --git a/mps/code/config.h b/mps/code/config.h
index c785cf7f949..d66487e1684 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -341,12 +341,10 @@
 
 /* Stack configuration */
 
-/* Currently StackProbe has a useful implementation only on
- * Intel platforms and only when using Microsoft build tools (builder.mv)
- */
-#if defined(MPS_ARCH_I3) && defined(MPS_BUILD_MV)
+/* Currently StackProbe has a useful implementation only on Windows. */
+#if defined(MPS_OS_W3) && defined(MPS_ARCH_I3)
 #define StackProbeDEPTH ((Size)500)
-#elif defined(MPS_PF_W3I6MV)
+#elif defined(MPS_OS_W3) && defined(MPS_ARCH_I6)
 #define StackProbeDEPTH ((Size)500)
 #else
 #define StackProbeDEPTH ((Size)0)