5 files changed, 2 insertions, 37 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 9897f6e011..00b67a1f08 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -71,12 +71,6 @@
 
     *Gannon McGibbon*
 
-*   Add JSON support to rails properties route (`/rails/info/properties`).
-
-    Now, `Rails::Info` properties may be accessed in JSON format at `/rails/info/properties.json`.
-
-    *Yoshiyuki Hirano*
-
 *   Use Ids instead of memory addresses when displaying references in scaffold views.
 
     Fixes #29200.
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index c68405619d..72b555ec19 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -54,10 +54,6 @@ module Rails
           table << "</table>"
         end
       end
-
-      def to_json
-        Hash[properties].to_json
-      end
     end
 
     # The Rails version.
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index 14459623ac..f74d979721 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -14,16 +14,8 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
   end
 
   def properties
-    respond_to do |format|
-      format.html do
-        @info = Rails::Info.to_html
-        @page_title = "Properties"
-      end
-
-      format.json do
-        render json: Rails::Info.to_json
-      end
-    end
+    @info = Rails::Info.to_html
+    @page_title = "Properties"
   end
 
   def routes
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 6ab68f8333..878a238f8d 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -50,11 +50,6 @@ class InfoControllerTest < ActionController::TestCase
     assert_select "table"
   end
 
-  test "info controller renders json with properties" do
-    get :properties, format: :json
-    assert_equal Rails::Info.to_json, response.body
-  end
-
   test "info controller renders with routes" do
     get :routes
     assert_response :success
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index d167a86e56..50522c1be6 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -43,18 +43,6 @@ class InfoTest < ActiveSupport::TestCase
     end
   end
 
-  def test_json_includes_middleware
-    Rails::Info.module_eval do
-      property "Middleware", ["Rack::Lock", "Rack::Static"]
-    end
-
-    hash = JSON.parse(Rails::Info.to_json)
-    assert_includes hash.keys, "Middleware"
-    properties.value_for("Middleware").each do |value|
-      assert_includes hash["Middleware"], value
-    end
-  end
-
   private
     def properties
       Rails::Info.properties