diff --git a/test/test_cpp_extensions_aot.py b/test/test_cpp_extensions_aot.py
index f2ce450c7dd..0f3d7d892c6 100644
--- a/test/test_cpp_extensions_aot.py
+++ b/test/test_cpp_extensions_aot.py
@@ -55,7 +55,6 @@ class TestCppExtensionAOT(common.TestCase):
         self.assertEqual(tensor.grad, expected_tensor_grad)
 
     @unittest.skipIf(not TEST_CUDA, "CUDA not found")
-    @unittest.skipIf(IS_WINDOWS, "Flaky on Windows, see issue #33270")
     def test_cuda_extension(self):
         import torch_test_cpp_extension.cuda as cuda_extension
 
diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
index 7240eeb9100..cd397e19ada 100644
--- a/torch/utils/cpp_extension.py
+++ b/torch/utils/cpp_extension.py
@@ -454,13 +454,13 @@ class BuildExtension(build_ext, object):
                                              include_dirs, sources,
                                              depends, extra_postargs)
             common_cflags = extra_preargs or []
-            common_cflags.append('/c')
+            cflags = []
             if debug:
-                common_cflags.extend(self.compiler.compile_options_debug)
+                cflags.extend(self.compiler.compile_options_debug)
             else:
-                common_cflags.extend(self.compiler.compile_options)
+                cflags.extend(self.compiler.compile_options)
             common_cflags.extend(COMMON_MSVC_FLAGS)
-            cflags = common_cflags + pp_opts
+            cflags = cflags + common_cflags + pp_opts
             with_cuda = any(map(_is_cuda_file, sources))
 
             # extra_postargs can be either:
@@ -477,11 +477,8 @@ class BuildExtension(build_ext, object):
             if with_cuda:
                 cuda_cflags = []
                 for common_cflag in common_cflags:
-                    if common_cflag == '/c':
-                        cuda_cflags.append('-c')
-                    else:
-                        cuda_cflags.append('-Xcompiler')
-                        cuda_cflags.append(common_cflag)
+                    cuda_cflags.append('-Xcompiler')
+                    cuda_cflags.append(common_cflag)
                 cuda_cflags.extend(pp_opts)
                 if isinstance(extra_postargs, dict):
                     cuda_post_cflags = extra_postargs['nvcc']