Rework EnvironmentBuilder.