diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 5ee6960c86be24558a2b7285a0e5daeb2e1c0681..d344277ab21d076aff667c684fd9e4a450bcfd23 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -183,31 +183,6 @@ def destroy_all
         end
       end
 
-      # Returns the number of records. If no arguments are given, it counts all
-      # columns using SQL. If one argument is given, it counts only the passed
-      # column using SQL. If a block is given, it counts the number of records
-      # yielding a true value.
-      def count(column_name = nil)
-        return super if block_given?
-        relation = scope
-        if association_scope.distinct_value
-          # This is needed because 'SELECT count(DISTINCT *)..' is not valid SQL.
-          column_name ||= reflection.klass.primary_key
-          relation = relation.distinct
-        end
-
-        value = relation.count(column_name)
-
-        limit  = options[:limit]
-        offset = options[:offset]
-
-        if limit || offset
-          [ [value - offset.to_i, 0].max, limit.to_i ].min
-        else
-          value
-        end
-      end
-
       # Removes +records+ from this association calling +before_remove+ and
       # +after_remove+ callbacks.
       #
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 48436155cedb24eb03d45d5e9497d6fdaec7724b..dda240585e9a24246828ff7e3a748e6184073d0b 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -743,6 +743,20 @@ def distinct
       end
       alias uniq distinct
 
+      def calculate(operation, column_name)
+        null_scope? ? scope.calculate(operation, column_name) : super
+      end
+
+      def pluck(*column_names)
+        null_scope? ? scope.pluck(*column_names) : super
+      end
+
+      ##
+      # :method: count
+      #
+      # :call-seq:
+      #   count(column_name = nil, &block)
+      #
       # Count all records.
       #
       #   class Person < ActiveRecord::Base
@@ -762,17 +776,6 @@ def distinct
       # perform the count using Ruby.
       #
       #   person.pets.count { |pet| pet.name.include?('-') } # => 2
-      def count(column_name = nil, &block)
-        @association.count(column_name, &block)
-      end
-
-      def calculate(operation, column_name)
-        null_scope? ? scope.calculate(operation, column_name) : super
-      end
-
-      def pluck(*column_names)
-        null_scope? ? scope.pluck(*column_names) : super
-      end
 
       # Returns the size of the collection. If the collection hasn't been loaded,
       # it executes a <tt>SELECT COUNT(*)</tt> query. Else it calls <tt>collection.size</tt>.