a85f33d2b2
This reverts commit 29b2ca9d21.
Apparently not as broken was we thought. While holding distutils code
paths, it does not always call into them.