Revert recent installer changes as they create more issues than they fixed.

This reverts commits e7282052993602ae5e0a1d3a8485c17adbf89d50
and 1749ef46dfc4c9ead4e41766ba9cace786f4fa35 .