3 files changed, 6 insertions, 7 deletions
diff --git a/lib/puppet/feature/json.rb b/lib/puppet/feature/json.rb
deleted file mode 100644
index 1f3845c2a..000000000
--- a/lib/puppet/feature/json.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# This is here so it autoloads correctly.
-Puppet.features.rails?
diff --git a/lib/puppet/feature/pson.rb b/lib/puppet/feature/pson.rb
new file mode 100644
index 000000000..21576c648
--- /dev/null
+++ b/lib/puppet/feature/pson.rb
@@ -0,0 +1,6 @@
+Puppet.features.add(:pson) do
+    require 'puppet/external/pson/common'
+    require 'puppet/external/pson/version'
+    require 'puppet/external/pson/pure'
+    true
+end
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 87b408c78..a29007273 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -35,8 +35,3 @@ Puppet.features.add(:rails) do
         true
     end
 end
-
-# We have JSON available
-# This is stupid - Rails breaks json compatibility if we load json before
-# rails, therefore we load rails and then json.  Dumb, mother-dumb.
-Puppet.features.add(:json, :libs => ["json"])