1 files changed, 12 insertions, 17 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 5f4667b4d8..e2b008034e 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -1,17 +1,16 @@
-require "active_record/associations/through_association_scope"
 require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   # = Active Record Has Many Through Association
   module Associations
     class HasManyThroughAssociation < HasManyAssociation #:nodoc:
-      include ThroughAssociationScope
+      include ThroughAssociation
 
       alias_method :new, :build
 
       def destroy(*records)
         transaction do
-          delete_records(flatten_deeper(records))
+          delete_records(records.flatten)
           super
         end
       end
@@ -21,9 +20,13 @@ module ActiveRecord
       # have a size larger than zero, and you need to fetch that collection afterwards, it'll take one fewer
       # SELECT query if you use #length.
       def size
-        return @owner.send(:read_attribute, cached_counter_attribute_name) if has_cached_counter?
-        return @target.size if loaded?
-        return count
+        if has_cached_counter?
+          @owner.send(:read_attribute, cached_counter_attribute_name)
+        elsif loaded?
+          @target.size
+        else
+          count
+        end
       end
 
       protected
@@ -51,9 +54,9 @@ module ActiveRecord
 
         # TODO - add dependent option support
         def delete_records(records)
-          klass = @reflection.through_reflection.klass
+          through_association = @owner.send(@reflection.through_reflection.name)
           records.each do |associate|
-            klass.delete_all(construct_join_attributes(associate))
+            through_association.where(construct_join_attributes(associate)).delete_all
           end
         end
 
@@ -63,16 +66,8 @@ module ActiveRecord
           scoped.all
         end
 
-        def has_cached_counter?
-          @owner.attribute_present?(cached_counter_attribute_name)
-        end
-
-        def cached_counter_attribute_name
-          "#{@reflection.name}_count"
-        end
-
         # NOTE - not sure that we can actually cope with inverses here
-        def we_can_set_the_inverse_on_this?(record)
+        def invertible_for?(record)
           false
         end
     end