diff --git a/common-manylinux.crosstool b/common-manylinux.crosstool
index 2110eb3..dbcf80c 100644
--- a/common-manylinux.crosstool
+++ b/common-manylinux.crosstool
@@ -57,7 +57,10 @@ RUN \
   /dockcross/install-crosstool-ng-toolchain.sh \
   -p "${XCC_PREFIX}" \
   -c /dockcross/crosstool-ng.config && \
-  rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh
+  rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
+  # Remove sudo provided by devtoolset since it doesn't work with
+  # our sudo wrapper calling gosu.
+  rm -f /opt/rh/devtoolset-9/root/usr/bin/sudo
 
 # Restore our default workdir (from "dockcross/base").
 WORKDIR /work
diff --git a/common.manylinux b/common.manylinux
index bb3e5b9..7775800 100644
--- a/common.manylinux
+++ b/common.manylinux
@@ -20,7 +20,7 @@ RUN \
   yum clean all && \
   /buildscripts/install-gosu-binary.sh && \
   /buildscripts/install-gosu-binary-wrapper.sh && \
-  # Remove sudo provided by "devtoolset-2" and "devtoolset-8" since it doesn't work with
+  # Remove sudo provided by devtoolset since it doesn't work with
   # our sudo wrapper calling gosu.
   rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \
   rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \