diff --git a/changelog.d/11700.removal b/changelog.d/11700.removal
new file mode 100644
index 0000000000000000000000000000000000000000..d3d3c48f0fc43136a9ba04bfe09e447323570efd
--- /dev/null
+++ b/changelog.d/11700.removal
@@ -0,0 +1 @@
+Remove workaround introduced in Synapse 1.50.0 for Mjolnir compatibility. Breaks compatibility with Mjolnir 1.3.1 and earlier.
diff --git a/docs/upgrade.md b/docs/upgrade.md
index 0d0bb066ee63c55a215ec66e6229c2ce76d3f616..95005962dc49d7a8fcb59f9a8498c5d78d37a543 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -106,6 +106,14 @@ You will need to ensure `synctl` is on your `PATH`.
     automatically, though you might need to activate a virtual environment
     depending on how you installed Synapse.
 
+
+## Compatibility dropped for Mjolnir 1.3.1 and earlier
+
+Synapse v1.55.0 drops support for Mjolnir 1.3.1 and earlier.
+If you use the Mjolnir module to moderate your homeserver,
+please upgrade Mjolnir to version 1.3.2 or later before upgrading Synapse.
+
+
 # Upgrading to v1.54.0
 
 ## Legacy structured logging configuration removal
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index 58b4220ff3551b15ec639f96562708844b3e8933..d8046b7553cb108560dafb6f8f26e64ce67fe800 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -31,13 +31,6 @@ from synapse.logging import context
 if typing.TYPE_CHECKING:
     pass
 
-# FIXME Mjolnir imports glob_to_regex from this file, but it was moved to
-#       matrix_common.
-#       As a temporary workaround, we import glob_to_regex here for
-#       compatibility with current versions of Mjolnir.
-# See https://github.com/matrix-org/mjolnir/pull/174
-from matrix_common.regex import glob_to_regex  # noqa
-
 logger = logging.getLogger(__name__)