3 files changed, 9 insertions, 24 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 59f209cec8..0333605eac 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -2,11 +2,6 @@ require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/deprecation'
 
 module ActiveRecord
-  ActiveSupport.on_load(:active_record_config) do
-    mattr_accessor :partial_writes, instance_accessor: false
-    self.partial_writes = true
-  end
-
   module AttributeMethods
     module Dirty # :nodoc:
       extend ActiveSupport::Concern
@@ -18,7 +13,8 @@ module ActiveRecord
           raise "You cannot include Dirty after Timestamp"
         end
 
-        config_attribute :partial_writes
+        class_attribute :partial_writes, instance_writer: false
+        self.partial_writes = true
 
         def self.partial_updates=(v); self.partial_writes = v; end
         def self.partial_updates?; partial_writes?; end
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 46fd6ebfb3..07c8859496 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -1,8 +1,4 @@
 module ActiveRecord
-  ActiveSupport.on_load(:active_record_config) do
-    mattr_accessor :attribute_types_cached_by_default, instance_accessor: false
-  end
-
   module AttributeMethods
     module Read
       extend ActiveSupport::Concern
@@ -10,7 +6,8 @@ module ActiveRecord
       ATTRIBUTE_TYPES_CACHED_BY_DEFAULT = [:datetime, :timestamp, :time, :date]
 
       included do
-        config_attribute :attribute_types_cached_by_default
+        class_attribute :attribute_types_cached_by_default, instance_writer: false
+        self.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
       end
 
       module ClassMethods
@@ -79,8 +76,6 @@ module ActiveRecord
         end
       end
 
-      ActiveRecord::Model.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
-
       # Returns the value of the attribute identified by <tt>attr_name</tt> after
       # it has been typecast (for example, "2004-12-12" in a data column is cast
       # to a date object, like Date.new(2004, 12, 12)).
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index f36a5806a9..806dc5b1d2 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -1,13 +1,4 @@
-
 module ActiveRecord
-  ActiveSupport.on_load(:active_record_config) do
-    mattr_accessor :time_zone_aware_attributes, instance_accessor: false
-    self.time_zone_aware_attributes = false
-
-    mattr_accessor :skip_time_zone_conversion_for_attributes, instance_accessor: false
-    self.skip_time_zone_conversion_for_attributes = []
-  end
-
   module AttributeMethods
     module TimeZoneConversion
       class Type # :nodoc:
@@ -28,8 +19,11 @@ module ActiveRecord
       extend ActiveSupport::Concern
 
       included do
-        config_attribute :time_zone_aware_attributes, global: true
-        config_attribute :skip_time_zone_conversion_for_attributes
+        mattr_accessor :time_zone_aware_attributes, instance_writer: false
+        self.time_zone_aware_attributes = false
+
+        class_attribute :skip_time_zone_conversion_for_attributes, instance_writer: false
+        self.skip_time_zone_conversion_for_attributes = []
       end
 
       module ClassMethods