Index: libcxx/test/support/msvc_stdlib_force_include.h
===================================================================
--- libcxx/test/support/msvc_stdlib_force_include.h
+++ libcxx/test/support/msvc_stdlib_force_include.h
@@ -13,9 +13,6 @@
 // MSVC standard library.
 
 #ifndef _LIBCXX_IN_DEVCRT
-    // Silence warnings about CRT machinery.
-    #define _CRT_SECURE_NO_WARNINGS
-
     // Avoid assertion dialogs.
     #define _CRT_SECURE_INVALID_PARAMETER(EXPR) ::abort()
 #endif // _LIBCXX_IN_DEVCRT
Index: libcxx/utils/libcxx/test/config.py
===================================================================
--- libcxx/utils/libcxx/test/config.py
+++ libcxx/utils/libcxx/test/config.py
@@ -272,7 +272,6 @@
         compile_flags_str = self.get_lit_conf('compile_flags', '')
         self.cxx.compile_flags += shlex.split(compile_flags_str)
         if self.target_info.is_windows():
-            # FIXME: Can we remove this?
             self.cxx.compile_flags += ['-D_CRT_SECURE_NO_WARNINGS']
             # Required so that tests using min/max don't fail on Windows,
             # and so that those tests don't have to be changed to tolerate