diff --git a/docs/conf.py b/docs/conf.py
index 37d5471..ed3c21e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,15 +14,6 @@
 """Pigweed's Sphinx configuration."""
 
 import sphinx
-import sphinx_rtd_theme
-
-# TODO(pwbug/376): Remove this when this PR is merged:
-# https://github.com/mgaitan/sphinxcontrib-mermaid/pull/71
-# Needed for sphinxcontrib-mermaid compatibility with sphinx 4.0.0.
-if sphinx.version_info[0] >= 4:
-    import errno
-    import sphinx.util.osutil
-    sphinx.util.osutil.ENOENT = errno.ENOENT
 
 # The suffix of source filenames.
 source_suffix = ['.rst']
diff --git a/pw_docgen/py/setup.py b/pw_docgen/py/setup.py
index c7afefb..8fce765 100644
--- a/pw_docgen/py/setup.py
+++ b/pw_docgen/py/setup.py
@@ -34,6 +34,6 @@
         'sphinxcontrib-blockdiag',
         'sphinxcontrib-nwdiag',
         'sphinxcontrib-seqdiag',
-        'sphinxcontrib-mermaid',
+        'sphinxcontrib-mermaid >=0.7.1',
     ],
 )