diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 84d70bd7b12b064095ce46cd1267229cf21e3ca9..69d00afda36563dbfa6530928678176c6ecd7300 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -81,10 +81,6 @@ if (WINDOWS)
   # Nicky: x64 implies SSE2
   if( NOT LL_64BIT_BUILD )
     add_definitions( /arch:SSE2 )
-  else()
-   # Otherwise disable 4267 ('var' : conversion from 'size_t' to 'type', possible loss of data) 
-   # This warning alas is all over the place and fixing it will touch a lot of code.
-   add_definitions("/wd4267 /DLL_64BIT_BUILD" ) 
   endif()
      
   # Are we using the crummy Visual Studio KDU build workaround?
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 2c4bcc91f6e96ec41c8e6b588de038025a3fc807..7c277c2bed9387605ae7442f19a6cc8a2c6ecea2 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -138,6 +138,12 @@
 #pragma warning( 3      :  4266 )	// 'function' : no override available for virtual member function from base 'type'; function is hidden
 #pragma warning (disable : 4180)	// qualifier applied to function type has no meaning; ignored
 //#pragma warning( disable : 4284 )	// silly MS warning deep inside their <map> include file
+
+#ifdef _M_AMD64
+// That one is all over the place for x64 builds.
+#pragma warning( disable : 4267 )   // 'var' : conversion from 'size_t' to 'type', possible loss of data)
+#endif
+
 #pragma warning( disable : 4503 )	// 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
 #pragma warning( disable : 4800 )	// 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
 #pragma warning( disable : 4996 )	// warning: deprecated