[571721] Avoid losing EnvironmentFactory when validating
1 file changed