diff --git a/doc/conf.py b/doc/conf.py
index 7d642e9419e986c793e287dc694bbb1ee712c946..13e5a69977332efa352c99c754d583dfb7d39e01 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -115,6 +115,12 @@ intersphinx_mapping = {
         "https://docs.python.org/3/": None,
         }
 
+
+# mostly a no-op on the pybind parts for now:
+# https://github.com/pybind/pybind11/issues/945
+autodoc_typehints = "description"
+
+
 def autodoc_process_signature(app, what, name, obj, options, signature,
         return_annotation):
     from inspect import ismethod