This reverts commit ca0c460406. All the installer tests are failing due to this change. cc @rickynils
ca0c460406