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