diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 1c12189e15401bddf8557d060981589bd70edd87..2fd33848776e409fe5ea3cfa3b34f6b006bc17ea 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -667,7 +667,7 @@ def all(*args)
         options = args.extract_options!
 
 
-        if options.empty? #&& !scoped?(:find)
+        if options.empty? && !scoped?(:find)
           relation = arel_table
         else
           include_associations = merge_includes(scope(:find, :include), options[:include])
@@ -1751,7 +1751,6 @@ def construct_finder_arel(options = {}, scope = scope(:find))
           relation = relation.readonly if options[:readonly]
 
           relation
-
         end
 
         def construct_finder_sql(options, scope = scope(:find))
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index 6dec474f7da3e361916b77a56bb9348ac498ce21..eb4ce0e7746e633d50c147079ee6a3d2476f9bb6 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -593,12 +593,12 @@ def test_default_scope
   end
 
   def test_default_scope_with_conditions_string
-    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.all.to_a.map(&:id).sort
+    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.find(:all).map(&:id).sort
     assert_equal nil, DeveloperCalledDavid.create!.name
   end
 
   def test_default_scope_with_conditions_hash
-    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.all.to_a.map(&:id).sort
+    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.find(:all).map(&:id).sort
     assert_equal 'Jamis', DeveloperCalledJamis.create!.name
   end
 
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 6fb505ca3614518be940e85bbb531544ac73b453..17c228616b8f4bf1c5c4b646153ea3d6802c296e 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -114,5 +114,16 @@ def test_find_with_included_associations
       posts.first.author
     end
   end
+
+    def test_default_scope_with_conditions_string
+    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.all.to_a.map(&:id).sort
+    assert_equal nil, DeveloperCalledDavid.create!.name
+  end
+
+  def test_default_scope_with_conditions_hash
+    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.all.to_a.map(&:id).sort
+    assert_equal 'Jamis', DeveloperCalledJamis.create!.name
+  end
+
 end
 
diff --git a/arel b/arel
index 755a7ced2f98b0bb246089c80cdfa04cd918fa89..8852db7087a8f4f98e5fd26fa33bac14a5400979 160000
--- a/arel
+++ b/arel
@@ -1 +1 @@
-Subproject commit 755a7ced2f98b0bb246089c80cdfa04cd918fa89
+Subproject commit 8852db7087a8f4f98e5fd26fa33bac14a5400979