1 files changed, 10 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/type/serialized.rb b/activerecord/lib/active_record/type/serialized.rb
index 3cac03464e..ea3e0d6a45 100644
--- a/activerecord/lib/active_record/type/serialized.rb
+++ b/activerecord/lib/active_record/type/serialized.rb
@@ -1,8 +1,7 @@
 module ActiveRecord
   module Type
     class Serialized < DelegateClass(Type::Value) # :nodoc:
-      include Mutable
-      include Decorator
+      include Helpers::Mutable
 
       attr_reader :subtype, :coder
 
@@ -12,7 +11,7 @@ module ActiveRecord
         super(subtype)
       end
 
-      def type_cast_from_database(value)
+      def deserialize(value)
         if default_value?(value)
           value
         else
@@ -20,32 +19,28 @@ module ActiveRecord
         end
       end
 
-      def type_cast_for_database(value)
+      def serialize(value)
         return if value.nil?
         unless default_value?(value)
           super coder.dump(value)
         end
       end
 
+      def inspect
+        Kernel.instance_method(:inspect).bind(self).call
+      end
+
       def changed_in_place?(raw_old_value, value)
         return false if value.nil?
-        subtype.changed_in_place?(raw_old_value, type_cast_for_database(value))
+        raw_new_value = serialize(value)
+        raw_old_value.nil? != raw_new_value.nil? ||
+          subtype.changed_in_place?(raw_old_value, raw_new_value)
       end
 
       def accessor
         ActiveRecord::Store::IndifferentHashAccessor
       end
 
-      def init_with(coder)
-        @coder = coder['coder']
-        super
-      end
-
-      def encode_with(coder)
-        coder['coder'] = @coder
-        super
-      end
-
       private
 
       def default_value?(value)