diff --git a/moz.configure b/moz.configure
index 04902e8dc2cc..583c5e8ed383 100755
--- a/moz.configure
+++ b/moz.configure
@@ -867,19 +867,6 @@ def strip_flags(flags, profiling, target):
 set_config("STRIP_FLAGS", strip_flags)
 
 
-@depends(llvm_tool("llvm-strip"), toolchain_prefix, target)
-def strip(llvm_strip, toolchain_prefix, target):
-    commands = ["strip"]
-    for prefix in toolchain_prefix or ():
-        commands.insert(0, "%sstrip" % prefix)
-    # llvm-strip causes some problems on macos targets.
-    if target.kernel == "Darwin":
-        commands.append(llvm_strip[0])
-    else:
-        commands.insert(0, llvm_strip[0])
-    return tuple(commands)
-
-
 def validate_strip(path):
     if "llvm-strip" not in path:
         return True
@@ -895,7 +882,7 @@ def strip_when(compile_env, target, host):
 
 check_prog(
     "STRIP",
-    strip,
+    plain_llvm_or_prefixed("strip"),
     when=strip_when,
     paths=clang_search_path,
     validate=validate_strip,