diff --git a/UPGRADING b/UPGRADING
index 26b2dd0f84b0..e8172382d798 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -293,6 +293,9 @@ PHP 8.5 UPGRADE NOTES
 * --enable-sanitzer is now supported for MSVC builds.  This enables ASan and
   debug assertions, and is supported as of MSVC 16.10 and Windows 10.
 
+* The --with-uncritical-warn-choke configuration option for clang builds is
+  no longer supported.  Select warnings to suppress via CFLAGS instead.
+
 * COM:
   . The extension is now build shared by default; previously it defaulted to a
     static extension, although the official Windows binaries built a shared
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 285c130aa791..f82ed73efe3b 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -355,7 +355,6 @@ if (PHP_SECURITY_FLAGS == "yes") {
 	ADD_FLAG("LDFLAGS", "/NXCOMPAT /DYNAMICBASE ");
 }
 
-ARG_WITH("uncritical-warn-choke", "Disable some uncritical warnings", "yes");
 ARG_ENABLE("sanitizer", "Enable ASan (and UBSan) extensions", "no");
 if (PHP_SANITIZER == "yes" && PHP_DEBUG == "yes") {
 	ERROR("Use of both --enable-sanitizer and --enable-debug not allowed.");
@@ -377,11 +376,6 @@ if (VS_TOOLSET) {
 	AC_DEFINE("PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW", 1, "Define to 1 if the compiler supports '__builtin_ssubll_overflow'.");
 	AC_DEFINE("PHP_HAVE_BUILTIN_SMULL_OVERFLOW", 1, "Define to 1 if the compiler supports '__builtin_smull_overflow '.");
 	AC_DEFINE("PHP_HAVE_BUILTIN_SMULLL_OVERFLOW", 1, "Define to 1 if the compiler supports '__builtin_smulll_overflow'.");
-	if (PHP_UNCRITICAL_WARN_CHOKE != "no") {
-		ADD_FLAG("CFLAGS", "-Wno-ignored-attributes -Wno-deprecated-declarations -Wno-missing-braces " +
-		"-Wno-logical-op-parentheses -Wno-msvc-include -Wno-invalid-source-encoding -Wno-unknown-pragmas " +
-		"-Wno-unused-command-line-argument -Wno-unused-function -Wno-ignored-pragma-optimize");
-	}
 
 	if (PHP_SANITIZER == "yes") {
 		if (COMPILER_NUMERIC_VERSION < 500) {
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index fed05f11e5d4..5a03ea102059 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -3305,6 +3305,7 @@ function toolset_setup_common_cflags()
 
 		ADD_FLAG("CFLAGS", "/Zc:wchar_t");
 	} else if (CLANG_TOOLSET) {
+		ADD_FLAG("CFLAGS", "-Wno-deprecated-declarations");
 		if (TARGET_ARCH == 'x86') {
 			ADD_FLAG('CFLAGS', '-m32');
 		} else {