diff --git a/src/protocol/MulleObjCRootObject.m b/src/protocol/MulleObjCRootObject.m
index ca430d4..58e1c9e 100644
--- a/src/protocol/MulleObjCRootObject.m
+++ b/src/protocol/MulleObjCRootObject.m
@@ -415,14 +415,7 @@ - (void) mulleRelinquishAccessWithTAOStrategy:(MulleObjCTAOStrategy) strategy
 //
 - (MulleObjCTAOStrategy) mulleTAOStrategy
 {
-   //
-   // So this default is MulleObjCTAOKnownThreadSafeMethods, because it doesn't
-   // break existing code. Known problematic subclasses like
-   // NSMutableDictionary then should actually reset this to some unsafe tag.
-   // In a future world where everything is a MulleObject, this would be unsafe
-   // and autolocking would promote this to ThreadSafe (?)
-   //
-   return( MulleObjCTAOKnownThreadSafeMethods);
+   return( MulleObjCTAOCallerRemovesFromCurrentPool);
 }
 
 
diff --git a/test/tao-mix/default.errors b/test/tao-mix/default.errors
index 23f6dbe..89bce15 100644
--- a/test/tao-mix/default.errors
+++ b/test/tao-mix/default.errors
@@ -1 +1 @@
-the universe is configured for thread affine objects
+runtime is compiled for thread affine objects
diff --git a/test/tao-thread/CMakeLists.txt b/test/tao-thread/CMakeLists.txt
index deec137..03016bd 100644
--- a/test/tao-thread/CMakeLists.txt
+++ b/test/tao-thread/CMakeLists.txt
@@ -17,19 +17,12 @@ project( tao-thread C)
 
 cmake_minimum_required( VERSION 3.11)
 
-set_source_files_properties( main.m PROPERTIES COMPILE_OPTIONS "-fno-objc-tao")
 
 add_executable( "${PROJECT_NAME}.exe"
    main.m
 )
 
-if( "${C_COMPILER_NAME}" MATCHES "mulle-cl*")
-   if( CMAKE_BUILD_TYPE MATCHES "^Debug|^Test")
-      target_compile_options( "${PROJECT_NAME}.exe" PRIVATE -fobjc-tao)
-      message( STATUS "TAO enabled via compiler flag")
-   endif()
-endif()
-
+set_source_files_properties( main.m PROPERTIES COMPILE_OPTIONS "-fno-objc-tao")
 
 target_link_libraries( "${PROJECT_NAME}.exe"
    ${TEST_LIBRARIES}
diff --git a/test/tao-thread/default.errors b/test/tao-thread/default.errors
index 23f6dbe..ba78a47 100644
--- a/test/tao-thread/default.errors
+++ b/test/tao-thread/default.errors
@@ -1 +1 @@
-the universe is configured for thread affine objects
+the runtime is configured for thread affine objects