diff --git a/BUILD.gn b/BUILD.gn
index d23c209b580..4656f5fed74 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -419,7 +419,7 @@ if (!build_with_chromium) {
       visibility += [ "//talk/owt" ]
     }
     sources = []
-    complete_static_lib = true
+    # complete_static_lib = true
     suppressed_configs += [ "//build/config/compiler:thin_archive" ]
     defines = []
 
diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc
index 20f58b2c819..3020292437a 100644
--- a/rtc_base/thread.cc
+++ b/rtc_base/thread.cc
@@ -82,8 +82,8 @@ Thread* Thread::Current() {
 #ifndef NO_MAIN_THREAD_WRAPPING
   // Only autowrap the thread which instantiated the ThreadManager.
   if (!thread && manager->IsMainThread()) {
-    thread = new Thread(SocketServer::CreateDefault());
-    thread->WrapCurrentWithThreadManager(manager, true);
+    //thread = new Thread(SocketServer::CreateDefault());
+    //thread->WrapCurrentWithThreadManager(manager, true);
   }
 #endif