Partial revert r69231, unrelated and unfinished installer changes