-# https://review.opendev.org/752793 and https://review.opendev.org/752794
-# merge and appear in a new PBR release
+# https://github.com/pypa/setuptools/issues/2086 is fixed in a new release of
+# Setuptools and the vendored copy in Python 3.8 and later updated with it;
+# also that won't work for Python 3.6 due to the older Setuptools there still
+# calling imp instead of importlib so probably not while we still support 3.6