diff --git a/nix/build-all.py b/nix/build-all.py
index ccf7e42cc6..d849b288fe 100644
--- a/nix/build-all.py
+++ b/nix/build-all.py
@@ -1285,13 +1285,7 @@ if "OpenCOLLADA" in targets:
     # OpenCOLLADAConfig.cmake.in hardcodes shared-lib targets on Unix regardless of
     # whether shared libs were actually built. We make it follow `USE_SHARED` instead.
     patches.append("./patches/opencollada/config_select_libs_by_use_shared.patch")
-
-    if WASM:
-        # This is necessary for the WASM build, because recent versions of
-        # clang don't have the tr1:: namespace anymore. However, it breaks
-        # some versions of gcc (9.4.0 at least) due to specializing std::hash
-        # outside of the std:: namespace.
-        patches.append("./patches/opencollada/remove_tr1.patch")
+    patches.append("./patches/opencollada/remove_tr1.patch")
 
     build_dependency(
         "OpenCOLLADA",
diff --git a/nix/patches/opencollada/remove_tr1.patch b/nix/patches/opencollada/remove_tr1.patch
index f586279d49..6b08b45595 100644
--- a/nix/patches/opencollada/remove_tr1.patch
+++ b/nix/patches/opencollada/remove_tr1.patch
@@ -27,11 +27,13 @@ index 8ab0fb9b..12503bfb 100644
 -        #define COLLADABU_HASH_MAP std::tr1::unordered_map
 -        #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
 -        #define COLLADABU_HASH_SET std::tr1::unordered_set
+-        #define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
+-        #define COLLADABU_HASH_NAMESPACE_CLOSE }
 +        #define COLLADABU_HASH_MAP std::unordered_map
 +        #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
 +        #define COLLADABU_HASH_SET std::unordered_set
-         #define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
-         #define COLLADABU_HASH_NAMESPACE_CLOSE }
++        #define COLLADABU_HASH_NAMESPACE_OPEN std
++        #define COLLADABU_HASH_NAMESPACE_CLOSE
          #define COLLADABU_HASH_FUN hash
 @@ -107,12 +107,12 @@
          #define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -45,11 +47,13 @@ index 8ab0fb9b..12503bfb 100644
 -		#define COLLADABU_HASH_MAP std::tr1::unordered_map
 -		#define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
 -        #define COLLADABU_HASH_SET std::tr1::unordered_set
+-        #define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
+-        #define COLLADABU_HASH_NAMESPACE_CLOSE }
 +		#define COLLADABU_HASH_MAP std::unordered_map
 +		#define COLLADABU_HASH_MULTIMAP std::unordered_multimap
 +        #define COLLADABU_HASH_SET std::unordered_set
-         #define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
-         #define COLLADABU_HASH_NAMESPACE_CLOSE }
++        #define COLLADABU_HASH_NAMESPACE_OPEN std
++        #define COLLADABU_HASH_NAMESPACE_CLOSE
          #define COLLADABU_HASH_FUN hash
 diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h
 index c7af45b2..fac4f133 100644