diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ca07ff349c7c5..c099ae2ec5c8d 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Remove ContentLength middleware from the defaults.  If you want it, just
+    add it as a middleware in your config.
+
+    *Egg McMuffin*
+
 *   Make it possible to customize the executable inside rerun snippets.
 
     *Yves Senn*
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 546d3725d8816..c1bd4072acf09 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,7 +78,6 @@ def start
 
     def middleware
       middlewares = []
-      middlewares << [::Rack::ContentLength]
 
       # FIXME: add Rack::Lock in the case people are using webrick.
       # This is to remain backwards compatible for those who are