diff --git a/lib/puppet/environments.rb b/lib/puppet/environments.rb
index 5fd8527ba45..c600d174a43 100644
--- a/lib/puppet/environments.rb
+++ b/lib/puppet/environments.rb
@@ -246,10 +246,8 @@ def create_environment(name)
 
       configured_path = File.join(@environment_dir, name.to_s)
       env.configured_path = configured_path
-      if Puppet.settings[:report_configured_environmentpath]
+      if Puppet.settings[:versioned_environment_dirs]
         env.resolved_path = validated_directory(configured_path)
-      else
-        env.resolved_path = configured_path
       end
 
       env