diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index 5959a7d833..fdf30338ac 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -22,5 +22,4 @@ if (USE_KDU)
   endif (STANDALONE)
   set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
   set(LLKDU_LIBRARIES llkdu)
-  add_definitions( -DUSE_KDU )
 endif (USE_KDU)
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 47d7e4adac..ea8c1a1107 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -63,10 +63,6 @@ target_link_libraries(llimage
     ${ZLIB_LIBRARIES}
     )
 
-if (USE_KDU)
-    add_definitions( -DUSE_KDU )
-endif (USE_KDU)
-
 # Add tests
 if (LL_TESTS)
   SET(llimage_TEST_SOURCE_FILES
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 758df82e06..08a21db5ff 100755
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -50,16 +50,7 @@ const std::string sTesterName("ImageCompressionTester");
 //static
 std::string LLImageJ2C::getEngineInfo()
 {
-    //return fallbackEngineInfoLLImageJ2CImpl(); # AO, returns corrupted string, needs investigation. Workaround below.
-    std::string J2CEngineStr;
-    llinfos << "Raw engine string was '" << fallbackEngineInfoLLImageJ2CImpl() << "'" << llendl;
-#ifdef USE_KDU
-    J2CEngineStr = "KDU";
-#else
-    J2CEngineStr = "OpenJPEG";
-    J2CEngineStr = fallbackEngineInfoLLImageJ2CImpl();
-#endif
-    return J2CEngineStr;
+    return fallbackEngineInfoLLImageJ2CImpl();
 }
 
 LLImageJ2C::LLImageJ2C() : 	LLImageFormatted(IMG_CODEC_J2C),