diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index e3caa07f74..479365c987 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -828,8 +828,6 @@ class DownloadStrategyDetector
       SubversionDownloadStrategy
     when %r[^https?://(.+?\.)?sourceforge\.net/hgweb/]
       MercurialDownloadStrategy
-    when bottle_native_regex, bottle_regex
-      CurlBottleDownloadStrategy
     else
       CurlDownloadStrategy
     end
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 1cdfa2e0d0..e835bf56da 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -131,6 +131,7 @@ class Bottle
       :revision => spec.revision,
       :tag => spec.current_tag
     )
+    @resource.download_strategy = CurlBottleDownloadStrategy
     @resource.version = f.pkg_version
     @resource.checksum = spec.checksum
     @prefix = spec.prefix
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index 6ecfb54f78..8e44cc5321 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -1,6 +1,5 @@
 require 'testing_env'
 require 'download_strategy'
-require 'bottles' # XXX: hoist these regexps into constants in Pathname?
 
 class ResourceDouble
   attr_reader :url, :specs
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index 7c9fb87205..f4a63e244d 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -1,6 +1,5 @@
 require 'testing_env'
 require 'software_spec'
-require 'bottles'
 
 class SoftwareSpecTests < Test::Unit::TestCase
   include VersionAssertions