diff -U 0 -r rails-3.1.0.rc3/config/initializers/wrap_parameters.rb rails-3.1.1/config/initializers/wrap_parameters.rb
--- rails-3.1.0.rc3/config/initializers/wrap_parameters.rb	2011-10-07 12:01:17.000000000 -0400
+++ rails-3.1.1/config/initializers/wrap_parameters.rb	2011-10-07 12:59:13.000000000 -0400
@@ -7 +7,3 @@
-ActionController::Base.wrap_parameters format: [:json]
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
@@ -10,2 +12,2 @@
-if defined?(ActiveRecord)
-  ActiveRecord::Base.include_root_in_json = false
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false