Revert "Merge branch 'new-install' into all-in-one-plus-setup.py"

This reverts commit 62e1f4de3006e4cb98fed13e9ff460a59bb5763d, reversing
changes made to c0fcf89987eeb64e45101a5ba655e930d64bd730.
Revert "Merge branch 'new-install' into all-in-one-plus-setup.py"

This reverts commit c0fcf89987eeb64e45101a5ba655e930d64bd730, reversing
changes made to 763f4e94e7f00a865b54320fa8ac421982295a65.