Consolidate bottle defaults and remove a method

1 files changed, 1 insertions, 6 deletions

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 2888a09c4..b1638286a 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -67,13 +67,8 @@ def bottle_regex
   Pathname::BOTTLE_EXTNAME_RX
 end
 
-def bottle_root_url f
-  root_url = f.bottle.root_url
-  root_url ||= 'https://downloads.sf.net/project/machomebrew/Bottles'
-end
-
 def bottle_url f, tag=bottle_tag
-  "#{bottle_root_url(f)}/#{bottle_filename(f, {:tag => tag})}"
+  "#{f.bottle.root_url}/#{bottle_filename(f, :tag => tag)}"
 end
 
 def bottle_tag