diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 34a5e59614b..e43d7b0935f 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -385,7 +385,6 @@ compiler.clang1701.debugPatched=true
 group.clangx86trunk.compilers=clang_trunk:clang_assertions_trunk:clang_concepts:clang_p1144:clang_autonsdmi:clang_lifetime:clang_p1061:clang_parmexpr:clang_patmat:clang_embed:clang_dang:clang_reflection:clang_variadic_friends:clang_widberg:clang_resugar:clang_clangir
 group.clangx86trunk.intelAsm=-mllvm --x86-asm-syntax=intel
 group.clangx86trunk.options=--gcc-toolchain=/opt/compiler-explorer/gcc-snapshot
-group.clangx86trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 group.clangx86trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 group.clangx86trunk.groupName=Clang x86-64
 group.clangx86trunk.instructionSet=amd64
@@ -656,7 +655,6 @@ compiler.armv7-clang900.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/c
 # An alias of this name needs to be maintained to allow old URLs to continue to work
 compiler.armv7-clang900.alias=armv7-clang-9
 compiler.armv7-clang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.armv7-clang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv7-clang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv7-clang-trunk.semver=(trunk)
 compiler.armv7-clang-trunk.isNightly=true
@@ -721,13 +719,11 @@ compiler.armv8-clang900.options=-target aarch64-linux-gnu --gcc-toolchain=/opt/c
 # An alias of this name needs to be maintained to allow old URLs to continue to work
 compiler.armv8-clang900.alias=armv8-clang-9
 compiler.armv8-clang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.armv8-clang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-clang-trunk.objdumper=/opt/compiler-explorer/arm64/gcc-10.2.0/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/bin/objdump
 compiler.armv8-clang-trunk.semver=(trunk)
 compiler.armv8-clang-trunk.isNightly=true
 compiler.armv8-clang-trunk.options=-target aarch64-linux-gnu --gcc-toolchain=/opt/compiler-explorer/arm64/gcc-12.2.0/aarch64-unknown-linux-gnu --sysroot=/opt/compiler-explorer/arm64/gcc-12.2.0/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot
 compiler.armv8-full-clang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.armv8-full-clang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-full-clang-trunk.objdumper=/opt/compiler-explorer/arm64/gcc-10.2.0/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/bin/objdump
 compiler.armv8-full-clang-trunk.semver=(all architectural features, trunk)
 compiler.armv8-full-clang-trunk.isNightly=true
@@ -782,7 +778,6 @@ compiler.mos-osi-c1p-trunk.semver=osi-c1p
 ################################
 # Clang for RISC-V
 group.rvclang.compilers=&rv32clang:&rv64clang
-group.rvclang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 group.rvclang.supportsBinary=true
 group.rvclang.supportsExecute=false
 group.rvclang.isSemVer=true
@@ -897,7 +892,6 @@ group.wasmclang.licensePreamble=The LLVM Project is under the Apache License v2.
 group.wasmclang.compilerCategories=clang
 
 compiler.wasm32clang.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.wasm32clang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.wasm32clang.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.wasm32clang.name=WebAssembly clang (trunk)
 compiler.wasm32clang.options=-target wasm32
@@ -1568,7 +1562,6 @@ compiler.ppc64gtrunk.objdumper=/opt/compiler-explorer/powerpc64/gcc-trunk/powerp
 compiler.ppc64gtrunk.demangler=/opt/compiler-explorer/powerpc64/gcc-trunk/powerpc64-unknown-linux-gnu/bin/powerpc64-unknown-linux-gnu-c++filt
 
 compiler.ppc64clang.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.ppc64clang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.ppc64clang.objdumper=/opt/compiler-explorer/gcc-11.2.0/powerpc64le-unknown-linux-gnu/bin/powerpc64le-unknown-linux-gnu-objdump
 compiler.ppc64clang.name=powerpc64 clang (trunk)
 compiler.ppc64clang.options=-target powerpc64
@@ -1633,7 +1626,6 @@ compiler.ppc64legtrunk.objdumper=/opt/compiler-explorer/powerpc64le/gcc-trunk/po
 compiler.ppc64legtrunk.demangler=/opt/compiler-explorer/powerpc64le/gcc-trunk/powerpc64le-unknown-linux-gnu/bin/powerpc64le-unknown-linux-gnu-c++filt
 
 compiler.ppc64leclang.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.ppc64leclang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.ppc64leclang.objdumper=/opt/compiler-explorer/gcc-11.2.0/powerpc64le-unknown-linux-gnu/bin/powerpc64le-unknown-linux-gnu-objdump
 compiler.ppc64leclang.name=power64le clang (trunk)
 compiler.ppc64leclang.options=-target powerpc64le
diff --git a/etc/config/c.amazon.properties b/etc/config/c.amazon.properties
index e2943d905bf..ae2165c8652 100644
--- a/etc/config/c.amazon.properties
+++ b/etc/config/c.amazon.properties
@@ -292,19 +292,16 @@ compiler.cclang1701.exe=/opt/compiler-explorer/clang-17.0.1/bin/clang
 compiler.cclang1701.semver=17.0.1
 compiler.cclang1701.options=--gcc-toolchain=/opt/compiler-explorer/gcc-13.2.0
 compiler.cclang_trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.cclang_trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.cclang_trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.cclang_trunk.semver=(trunk)
 compiler.cclang_trunk.isNightly=true
 compiler.cclang_trunk.options=--gcc-toolchain=/opt/compiler-explorer/gcc-snapshot
 compiler.cclang_assertions_trunk.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.cclang_assertions_trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.cclang_assertions_trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.cclang_assertions_trunk.semver=(assertions trunk)
 compiler.cclang_assertions_trunk.isNightly=true
 compiler.cclang_assertions_trunk.options=--gcc-toolchain=/opt/compiler-explorer/gcc-snapshot
 compiler.cclang_dang.exe=/opt/compiler-explorer/clang-dang-main/bin/clang
-compiler.cclang_dang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.cclang_dang.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.cclang_dang.semver=(thephd.dev)
 compiler.cclang_dang.isNightly=true
@@ -529,7 +526,6 @@ compiler.armv8-cclang900.alias=armv8-cclang-9
 
 compiler.armv7-cclang-trunk.name=armv7-a clang (trunk)
 compiler.armv7-cclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv7-cclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv7-cclang-trunk.objdumper=/opt/compiler-explorer/arm/gcc-10.2.0/arm-unknown-linux-gnueabihf/bin/arm-unknown-linux-gnueabihf-objdump
 compiler.armv7-cclang-trunk.semver=(trunk)
 compiler.armv7-cclang-trunk.isNightly=true
@@ -538,7 +534,6 @@ compiler.armv7-cclang-trunk.options=-target arm-linux-gnueabi --gcc-toolchain=/o
 
 compiler.armv8-cclang-trunk.name=armv8-a clang (trunk)
 compiler.armv8-cclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv8-cclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-cclang-trunk.objdumper=/opt/compiler-explorer/arm64/gcc-10.2.0/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/bin/objdump
 compiler.armv8-cclang-trunk.semver=(trunk)
 compiler.armv8-cclang-trunk.isNightly=true
@@ -547,7 +542,6 @@ compiler.armv8-cclang-trunk.options=-target aarch64-linux-gnu --gcc-toolchain=/o
 
 compiler.armv8-full-cclang-trunk.name=armv8-a clang (all architectural features, trunk)
 compiler.armv8-full-cclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv8-full-cclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-full-cclang-trunk.objdumper=/opt/compiler-explorer/arm64/gcc-10.2.0/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/bin/objdump
 compiler.armv8-full-cclang-trunk.semver=(trunk allfeats)
 compiler.armv8-full-cclang-trunk.isNightly=true
@@ -604,7 +598,6 @@ compiler.cmos-osi-c1p-trunk.semver=osi-c1p
 ################################
 # Clang for RISC-V
 group.rvcclang.compilers=&rv32cclang:&rv64cclang
-group.rvcclang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 group.rvcclang.supportsBinary=true
 group.rvcclang.supportsBinaryObject=true
 group.rvcclang.supportsExecute=false
@@ -725,7 +718,6 @@ group.wasmcclang.licensePreamble=The LLVM Project is under the Apache License v2
 group.wasmcclang.compilerCategories=clang
 
 compiler.wasm32cclang.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.wasm32cclang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.wasm32cclang.name=WebAssembly clang (trunk)
 compiler.wasm32cclang.isNightly=true
 compiler.wasm32cclang.options=-target wasm32
@@ -1361,7 +1353,6 @@ compiler.cppc64gtrunk.objdumper=/opt/compiler-explorer/powerpc64/gcc-trunk/power
 compiler.cppc64gtrunk.demangler=/opt/compiler-explorer/powerpc64/gcc-trunk/powerpc64-unknown-linux-gnu/bin/powerpc64-unknown-linux-gnu-c++filt
 
 compiler.cppc64clang.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.cppc64clang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.cppc64clang.objdumper=/opt/compiler-explorer/gcc-11.2.0/powerpc64le-unknown-linux-gnu/bin/powerpc64le-unknown-linux-gnu-objdump
 compiler.cppc64clang.name=powerpc64 clang (trunk)
 compiler.cppc64clang.options=-target powerpc64
@@ -1422,7 +1413,6 @@ compiler.cppc64legtrunk.objdumper=/opt/compiler-explorer/powerpc64le/gcc-trunk/p
 compiler.cppc64legtrunk.demangler=/opt/compiler-explorer/powerpc64le/gcc-trunk/powerpc64le-unknown-linux-gnu/bin/powerpc64le-unknown-linux-gnu-c++filt
 
 compiler.cppc64leclang.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.cppc64leclang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.cppc64leclang.objdumper=/opt/compiler-explorer/gcc-11.2.0/powerpc64le-unknown-linux-gnu/bin/powerpc64le-unknown-linux-gnu-objdump
 compiler.cppc64leclang.name=power64le clang (trunk)
 compiler.cppc64leclang.options=-target powerpc64le
diff --git a/etc/config/cpp_for_opencl.amazon.properties b/etc/config/cpp_for_opencl.amazon.properties
index 20ae69cdd56..16b14a97a73 100644
--- a/etc/config/cpp_for_opencl.amazon.properties
+++ b/etc/config/cpp_for_opencl.amazon.properties
@@ -137,7 +137,6 @@ compiler.armv8-cpp4oclclang1000.options=-cl-std=clc++ -x cl -Xclang -finclude-de
 #main dev version
 compiler.armv7-cpp4oclclang-trunk.name=armv7-a clang (trunk)
 compiler.armv7-cpp4oclclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv7-cpp4oclclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv7-cpp4oclclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv7-cpp4oclclang-trunk.semver=(trunk)
 compiler.armv7-cpp4oclclang-trunk.isNightly=true
@@ -146,7 +145,6 @@ compiler.armv7-cpp4oclclang-trunk.options=-target arm-linux-gnueabi --gcc-toolch
 
 compiler.armv7-cpp4oclclang-trunk-assertions.name=armv7-a clang (trunk, assertions)
 compiler.armv7-cpp4oclclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.armv7-cpp4oclclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv7-cpp4oclclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv7-cpp4oclclang-trunk-assertions.semver=(assertions trunk)
 compiler.armv7-cpp4oclclang-trunk-assertions.isNightly=true
@@ -155,7 +153,6 @@ compiler.armv7-cpp4oclclang-trunk-assertions.options=-target arm-linux-gnueabi -
 
 compiler.armv8-cpp4oclclang-trunk.name=armv8-a clang (trunk)
 compiler.armv8-cpp4oclclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv8-cpp4oclclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-cpp4oclclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv8-cpp4oclclang-trunk.semver=(trunk)
 compiler.armv8-cpp4oclclang-trunk.isNightly=true
@@ -164,7 +161,6 @@ compiler.armv8-cpp4oclclang-trunk.options=-target aarch64-linux-gnu --gcc-toolch
 
 compiler.armv8-cpp4oclclang-trunk-assertions.name=armv8-a clang (trunk, assertions)
 compiler.armv8-cpp4oclclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.armv8-cpp4oclclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-cpp4oclclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv8-cpp4oclclang-trunk-assertions.semver=(assertions trunk)
 compiler.armv8-cpp4oclclang-trunk-assertions.isNightly=true
@@ -173,7 +169,6 @@ compiler.armv8-cpp4oclclang-trunk-assertions.options=-target aarch64-linux-gnu -
 
 compiler.armv8-full-cpp4oclclang-trunk.name=armv8-a clang (all architectural features, trunk)
 compiler.armv8-full-cpp4oclclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv8-full-cpp4oclclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-full-cpp4oclclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv8-full-cpp4oclclang-trunk.semver=(trunk allfeats)
 compiler.armv8-full-cpp4oclclang-trunk.isNightly=true
@@ -203,7 +198,6 @@ group.spirv64cpp4oclclang.baseOptions=-finclude-default-header -fdeclare-opencl-
 compiler.spirv32-cpp4oclclang-trunk.alias=armv7-cpp4oclclang-trunk-spir
 compiler.spirv32-cpp4oclclang-trunk.name=clang & llvm-spirv (trunk)
 compiler.spirv32-cpp4oclclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.spirv32-cpp4oclclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv32-cpp4oclclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv32-cpp4oclclang-trunk.semver=(trunk)
 compiler.spirv32-cpp4oclclang-trunk.isNightly=true
@@ -211,7 +205,6 @@ compiler.spirv32-cpp4oclclang-trunk.isNightly=true
 compiler.spirv32-cpp4oclclang-trunk-assertions.alias=armv7-cpp4oclclang-trunk-assertions-spir
 compiler.spirv32-cpp4oclclang-trunk-assertions.name=clang & llvm-spirv (trunk, assertions)
 compiler.spirv32-cpp4oclclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.spirv32-cpp4oclclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv32-cpp4oclclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv32-cpp4oclclang-trunk-assertions.semver=(assertions trunk)
 compiler.spirv32-cpp4oclclang-trunk-assertions.isNightly=true
@@ -220,7 +213,6 @@ compiler.spirv32-cpp4oclclang-trunk-assertions.isNightly=true
 compiler.spirv64-cpp4oclclang-trunk.alias=armv8-cpp4oclclang-trunk-spir64
 compiler.spirv64-cpp4oclclang-trunk.name=clang & llvm-spirv (trunk)
 compiler.spirv64-cpp4oclclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.spirv64-cpp4oclclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv64-cpp4oclclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv64-cpp4oclclang-trunk.semver=(trunk)
 compiler.spirv64-cpp4oclclang-trunk.isNightly=true
@@ -228,7 +220,6 @@ compiler.spirv64-cpp4oclclang-trunk.isNightly=true
 compiler.spirv64-cpp4oclclang-trunk-assertions.alias=armv8-cpp4oclclang-trunk-assertions-spir64
 compiler.spirv64-cpp4oclclang-trunk-assertions.name=clang & llvm-spirv (trunk, assertions)
 compiler.spirv64-cpp4oclclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.spirv64-cpp4oclclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv64-cpp4oclclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv64-cpp4oclclang-trunk-assertions.semver=(assertions trunk)
 compiler.spirv64-cpp4oclclang-trunk-assertions.isNightly=true
diff --git a/etc/config/llvm.amazon.properties b/etc/config/llvm.amazon.properties
index c3c2f6b4828..4b4e6e434b3 100644
--- a/etc/config/llvm.amazon.properties
+++ b/etc/config/llvm.amazon.properties
@@ -50,11 +50,9 @@ compiler.irclang1600.semver=16.0.0
 compiler.irclang1701.exe=/opt/compiler-explorer/clang-17.0.1/bin/clang++
 compiler.irclang1701.semver=17.0.1
 compiler.irclangtrunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
-compiler.irclangtrunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.irclangtrunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.irclangtrunk.semver=(trunk)
 compiler.irclang-assertions-trunk.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang++
-compiler.irclang-assertions-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.irclang-assertions-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.irclang-assertions-trunk.semver=(assertions trunk)
 
@@ -110,11 +108,9 @@ compiler.llc1600.semver=16.0.0
 compiler.llc1701.exe=/opt/compiler-explorer/clang-17.0.1/bin/llc
 compiler.llc1701.semver=17.0.1
 compiler.llctrunk.exe=/opt/compiler-explorer/clang-trunk/bin/llc
-compiler.llctrunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.llctrunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.llctrunk.semver=(trunk)
 compiler.llc-assertions-trunk.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/llc
-compiler.llc-assertions-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.llc-assertions-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.llc-assertions-trunk.semver=(assertions trunk)
 
@@ -172,11 +168,9 @@ compiler.opt1600.semver=16.0.0
 compiler.opt1701.exe=/opt/compiler-explorer/clang-17.0.1/bin/opt
 compiler.opt1701.semver=17.0.1
 compiler.opttrunk.exe=/opt/compiler-explorer/clang-trunk/bin/opt
-compiler.opttrunk.demangler=/opt/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.opttrunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.opttrunk.semver=(trunk)
 compiler.opt-assertions-trunk.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/opt
-compiler.opt-assertions-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.opt-assertions-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.opt-assertions-trunk.semver=(assertions trunk)
 
diff --git a/etc/config/openclc.amazon.properties b/etc/config/openclc.amazon.properties
index 26ba45c93a2..a96358c5279 100644
--- a/etc/config/openclc.amazon.properties
+++ b/etc/config/openclc.amazon.properties
@@ -162,7 +162,6 @@ compiler.armv8-oclcclang900.options=-Xclang -finclude-default-header -target aar
 
 compiler.armv7-oclcclang-trunk.name=armv7-a clang (trunk)
 compiler.armv7-oclcclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv7-oclcclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv7-oclcclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv7-oclcclang-trunk.semver=(trunk)
 # Arm v7-a with Neon and VFPv3
@@ -170,7 +169,6 @@ compiler.armv7-oclcclang-trunk.options=-target arm-linux-gnueabi --gcc-toolchain
 
 compiler.armv7-oclcclang-trunk-assertions.name=armv7-a clang (trunk, assertions)
 compiler.armv7-oclcclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.armv7-oclcclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv7-oclcclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv7-oclcclang-trunk-assertions.semver=(assertions trunk)
 # Arm v7-a with Neon and VFPv3
@@ -178,7 +176,6 @@ compiler.armv7-oclcclang-trunk-assertions.options=-target arm-linux-gnueabi --gc
 
 compiler.armv8-oclcclang-trunk.name=armv8-a clang (trunk)
 compiler.armv8-oclcclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv8-oclcclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-oclcclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv8-oclcclang-trunk.semver=(trunk)
 # Arm v8-a
@@ -186,7 +183,6 @@ compiler.armv8-oclcclang-trunk.options=-target aarch64-linux-gnu --gcc-toolchain
 
 compiler.armv8-oclcclang-trunk-assertions.name=armv8-a clang (trunk, assertions)
 compiler.armv8-oclcclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.armv8-oclcclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-oclcclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv8-oclcclang-trunk-assertions.semver=(assertions trunk)
 # Arm v8-a
@@ -194,7 +190,6 @@ compiler.armv8-oclcclang-trunk-assertions.options=-target aarch64-linux-gnu --gc
 
 compiler.armv8-full-oclcclang-trunk.name=armv8-a clang (all architectural features, trunk)
 compiler.armv8-full-oclcclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.armv8-full-oclcclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.armv8-full-oclcclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.armv8-full-oclcclang-trunk.semver=(trunk allfeats)
 # Arm v8-a with all supported architectural features
@@ -223,14 +218,12 @@ group.spirv64oclcclang.baseOptions=-finclude-default-header -fdeclare-opencl-bui
 compiler.spirv32-oclcclang-trunk.alias=armv7-oclcclang-trunk-spir
 compiler.spirv32-oclcclang-trunk.name=clang & llvm-spirv (trunk)
 compiler.spirv32-oclcclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.spirv32-oclcclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv32-oclcclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv32-oclcclang-trunk.semver=(trunk)
 
 compiler.spirv32-oclcclang-trunk-assertions.alias=armv7-oclcclang-trunk-assertions-spir
 compiler.spirv32-oclcclang-trunk-assertions.name=clang & llvm-spirv (trunk, assertions)
 compiler.spirv32-oclcclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.spirv32-oclcclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv32-oclcclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv32-oclcclang-trunk-assertions.semver=(assertions trunk)
 
@@ -238,14 +231,12 @@ compiler.spirv32-oclcclang-trunk-assertions.semver=(assertions trunk)
 compiler.spirv64-oclcclang-trunk.alias=armv8-oclcclang-trunk-spir64
 compiler.spirv64-oclcclang-trunk.name=clang & llvm-spirv (trunk)
 compiler.spirv64-oclcclang-trunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
-compiler.spirv64-oclcclang-trunk.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv64-oclcclang-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv64-oclcclang-trunk.semver=(trunk)
 
 compiler.spirv64-oclcclang-trunk-assertions.alias=armv8-oclcclang-trunk-assertions-spir64
 compiler.spirv64-oclcclang-trunk-assertions.name=clang & llvm-spirv (trunk, assertions)
 compiler.spirv64-oclcclang-trunk-assertions.exe=/opt/compiler-explorer/clang-assertions-trunk/bin/clang
-compiler.spirv64-oclcclang-trunk-assertions.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
 compiler.spirv64-oclcclang-trunk-assertions.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.spirv64-oclcclang-trunk-assertions.semver=(assertions trunk)
 
diff --git a/lib/compilers/clang.ts b/lib/compilers/clang.ts
index 3ebad096132..8938429b4ff 100644
--- a/lib/compilers/clang.ts
+++ b/lib/compilers/clang.ts
@@ -55,10 +55,13 @@ export class ClangCompiler extends BaseCompiler {
     }
 
     constructor(info: PreliminaryCompilerInfo, env) {
-        // If a compiler-local llvm demangler exists - use it
-        const demanglerPath = path.join(path.dirname(info.exe), 'llvm-cxxfilt');
-        if (fs.existsSync(demanglerPath)) {
-            info.demangler = demanglerPath;
+        // By default use the compiler-local llvm demangler, but allow overriding from config
+        // (for bpf)
+        if (info.demangler === undefined) {
+            const demanglerPath = path.join(path.dirname(info.exe), 'llvm-cxxfilt');
+            if (fs.existsSync(demanglerPath)) {
+                info.demangler = demanglerPath;
+            }
         }
 
         super(info, env);