diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
index d11ab5050bc1..4179d1726bea 100644
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -271,7 +271,7 @@ libdmg-hfsplus:
     fetch:
         type: git
         repo: https://github.com/mozilla/libdmg-hfsplus/
-        revision: afebe241604e5f96841637c3d7e301b93b7690be
+        revision: 2ee327795680101d36f9700bd0fb618362237718
 
 hfsplus-tools:
     description: hfstools-plus source code
diff --git a/taskcluster/ci/system-symbols/kind.yml b/taskcluster/ci/system-symbols/kind.yml
index b5281c6bbe42..a8eb2a527f04 100644
--- a/taskcluster/ci/system-symbols/kind.yml
+++ b/taskcluster/ci/system-symbols/kind.yml
@@ -54,9 +54,6 @@ jobs:
                 ./run.sh
         treeherder:
             symbol: system-symbols-mac
-        fetches:
-            toolchain:
-                - linux64-libdmg
     win:
         description: Extract windows system symbols found in crashreports
         attributes:
diff --git a/taskcluster/docker/system-symbols-mac/setup.sh b/taskcluster/docker/system-symbols-mac/setup.sh
index aab2a634873b..c6c0e8e67e70 100644
--- a/taskcluster/docker/system-symbols-mac/setup.sh
+++ b/taskcluster/docker/system-symbols-mac/setup.sh
@@ -10,6 +10,15 @@ cd xar/xar
 ./autogen.sh --prefix=/builds/worker
 make "$ncpu" && make install
 
+cd $WORK
+git clone --depth=1 --single-branch -b system-symbols-mac https://github.com/gabrielesvelto/libdmg-hfsplus.git
+cd libdmg-hfsplus
+cmake .
+make "$ncpu" dmg-bin hfsplus
+# `make install` installs way too much stuff
+cp dmg/dmg hfs/hfsplus /builds/worker/bin
+strip /builds/worker/bin/dmg /builds/worker/bin/hfsplus
+
 pip3 install --no-cache-dir git+https://github.com/gabrielesvelto/reposado
 
 python3 /usr/local/bin/repoutil --configure <<EOF
diff --git a/tools/crashreporter/system-symbols/mac/parse_pbzx.py b/tools/crashreporter/system-symbols/mac/parse_pbzx.py
index 2f49c20f5d85..242a58608e90 100755
--- a/tools/crashreporter/system-symbols/mac/parse_pbzx.py
+++ b/tools/crashreporter/system-symbols/mac/parse_pbzx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # This code is from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d
 #
 # v2 pbzx stream handler
@@ -49,8 +49,8 @@ def parse_pbzx(pbzx_path):
     # pbzx = f.read()
     # f.close()
     magic = seekread(f, length=4)
-    if magic != b"pbzx":
-        raise Exception("Error: Not a pbzx file")
+    if magic != "pbzx":
+        raise "Error: Not a pbzx file"
     # Read 8 bytes for initial flags
     flags = seekread(f, length=8)
     # Interpret the flags as a 64-bit big-endian unsigned int
@@ -64,7 +64,7 @@ def parse_pbzx(pbzx_path):
         f_length = seekread(f, length=8)
         f_length = struct.unpack(">Q", f_length)[0]
         xzmagic = seekread(f, length=6)
-        if xzmagic != b"\xfd7zXZ\x00":
+        if xzmagic != "\xfd7zXZ\x00":
             # This isn't xz content, this is actually _raw decompressed cpio_
             # chunk of 16MB in size...
             # Let's back up ...
@@ -89,9 +89,9 @@ def parse_pbzx(pbzx_path):
             tail = seekread(f, offset=-2, length=2)
             xar_f.write(xzmagic)
             xar_f.write(f_content)
-            if tail != b"YZ":
+            if tail != "YZ":
                 xar_f.close()
-                raise Exception("Error: Footer is not xar file footer")
+                raise "Error: Footer is not xar file footer"
     try:
         f.close()
         xar_f.close()
diff --git a/tools/crashreporter/system-symbols/mac/run.sh b/tools/crashreporter/system-symbols/mac/run.sh
index 55d8cb1045cf..8b759c7717f1 100755
--- a/tools/crashreporter/system-symbols/mac/run.sh
+++ b/tools/crashreporter/system-symbols/mac/run.sh
@@ -3,7 +3,7 @@
 set -v -e -x
 
 base="$(realpath "$(dirname "$0")")"
-export PATH="$PATH:/builds/worker/bin:${MOZ_FETCHES_DIR}/dmg:$base"
+export PATH="$PATH:/builds/worker/bin:$base"
 
 DUMP_SYMS_PATH="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"