c4dd8f4017
...and partially revert a setuptools commit exposing another error. Context: https://github.com/pypa/setuptools/issues/3452 Reported by: Niels Kobschätzki PR: 285909