1 files changed, 3 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index ca0828ea7b..c32aaf986e 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -55,7 +55,7 @@ module ActiveRecord
           @target = (AssociationProxy === obj ? obj.target : obj)
         end
 
-        set_inverse_instance(obj, @owner)
+        set_inverse_instance(obj)
         @loaded = true
 
         unless !@owner.persisted? || obj.nil? || dont_save
@@ -81,7 +81,7 @@ module ActiveRecord
           the_target = with_scope(:find => @scope[:find]) do
             @reflection.klass.find(:first, options)
           end
-          set_inverse_instance(the_target, @owner)
+          set_inverse_instance(the_target)
           the_target
         end
 
@@ -107,17 +107,12 @@ module ActiveRecord
           else
             record[@reflection.primary_key_name] = @owner.id if @owner.persisted?
             self.target = record
-            set_inverse_instance(record, @owner)
+            set_inverse_instance(record)
           end
 
           record
         end
 
-        def we_can_set_the_inverse_on_this?(record)
-          inverse = @reflection.inverse_of
-          return !inverse.nil?
-        end
-
         def merge_with_conditions(attrs={})
           attrs ||= {}
           attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)