diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common
index 953ffe987cb8..fb4a5ca69855 100644
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -10,9 +10,6 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
 fi
 . "$topsrcdir/build/mozconfig.common"
 
-# Rust requires dsymutil into PATH
-mk_add_options "export PATH=$topsrcdir/llvm-dsymutil/bin:$PATH"
-
 # ld needs libLTO.so from llvm
 mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib"
 
diff --git a/build/unix/mozconfig.linux32 b/build/unix/mozconfig.linux32
index 8da778465d97..47c4ce3dbdd2 100644
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -6,3 +6,10 @@ CFLAGS="$CFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
 CXXFLAGS="$CXXFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
 
 ac_add_options --target=i686-pc-linux
+
+# The linux32 builds are effectively cross-compilations, and geckodriver
+# is not enabled by default on cross-compilations, because in most cases,
+# the target is not something we can run binaries of, and geckodriver
+# is a target binary instead of a host binary. But for linux32, we actually
+# can run the target binaries, so we can manually enable geckodriver.
+ac_add_options --enable-geckodriver
diff --git a/taskcluster/scripts/misc/build-llvm-dsymutil.sh b/taskcluster/scripts/misc/build-llvm-dsymutil.sh
index 93dfb09a81bd..406c8a5b7f2e 100755
--- a/taskcluster/scripts/misc/build-llvm-dsymutil.sh
+++ b/taskcluster/scripts/misc/build-llvm-dsymutil.sh
@@ -62,11 +62,7 @@ export LD_LIBRARY_PATH=$HOME_DIR/src/gcc/lib64
 
 ninja llvm-dsymutil llvm-symbolizer
 
-# Create a symbolic link since rust doesn't allow to specify a custom dsymutil.
-# This should be dropped once https://github.com/rust-lang/rust/issues/52728 fixed.
-ln -s llvm-dsymutil bin/dsymutil
-tar --xform='s,^,llvm-dsymutil/,S' -Jcf llvm-dsymutil.tar.xz \
-  bin/llvm-dsymutil bin/llvm-symbolizer bin/dsymutil
+tar --xform='s,^,llvm-dsymutil/,' -Jcf llvm-dsymutil.tar.xz bin/llvm-dsymutil bin/llvm-symbolizer
 
 mkdir -p $UPLOAD_DIR
 cp llvm-dsymutil.tar.xz $UPLOAD_DIR
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 027e00f6ad1d..78f9e2ac9b32 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -907,9 +907,9 @@ option('--enable-geckodriver', help='Enable WebDriver implementation')
 @depends('--enable-geckodriver',
          'MOZ_AUTOMATION',
          compile_environment,
-         target,
+         cross_compiling,
          hazard_analysis)
-def geckodriver(enable, automation, compile_env, target, hazard):
+def geckodriver(enable, automation, compile_env, cross_compile, hazard):
     """
     geckodriver is implied on supported platforms when MOZ_AUTOMATION
     is set, but we also provide the --enable-geckodriver option for
@@ -927,8 +927,7 @@ def geckodriver(enable, automation, compile_env, target, hazard):
         return True
 
     if enable.origin == 'default':
-        # Bug 1441656 for Android.
-        broken_platforms = hazard or target.os == 'Android'
+        broken_platforms = cross_compile or hazard
 
         if automation and compile_env and not broken_platforms:
             return True
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 9ac639527725..d8337d0de471 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -165,7 +165,7 @@ if CONFIG['ENABLE_MARIONETTE']:
         '/testing/marionette',
     ]
 
-if CONFIG['ENABLE_GECKODRIVER'] and not (CONFIG['MOZ_ASAN'] or CONFIG['MOZ_TSAN']):
+if CONFIG['ENABLE_GECKODRIVER']:
     DIRS += ['/testing/geckodriver']
 
 DIRS += [