diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba734396..fdaa6383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,6 @@
 
 ### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...0-9-stable)
 
-- [#2373](https://github.com/rails-api/active_model_serializers/pull/2373) Fix Rails 6.0 deprecation warnings.  (@supremebeing7)
-  
 ### [v0.9.7 (2017-05-01)](https://github.com/rails-api/active_model_serializers/compare/v0.9.6...v0.9.7)
 
 - [#2080](https://github.com/rails-api/active_model_serializers/pull/2080) remove `{ payload: nil }` from `!serialize.active_model_serializers` ActiveSupport::Notification. `payload` never had a value.  Changes, for example `{ serializer: 'ActiveModel::DefaultSerializer', payload: nil }` to be `{ serializer: 'ActiveModel::DefaultSerializer' }` (@yosiat)
diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index 1593dd14..d8aaef9a 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -60,15 +60,7 @@ module ActionController
     private
 
     def namespace_for_serializer
-      @namespace_for_serializer ||= namespace_for_class(self.class) unless namespace_for_class(self.class) == Object
-    end
-
-    def namespace_for_class(klass)
-      if Module.method_defined?(:module_parent)
-        klass.module_parent
-      else
-        klass.parent
-      end
+      @namespace_for_serializer ||= self.class.parent unless self.class.parent == Object
     end
 
     def default_serializer(resource)