This reverts commit a86f4ee774 and the fixup in 587206a442 because brakage on macos (TestAutoInstallMainExecutable.py).
a86f4ee774
587206a442