diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb
index 692a43988c..85c4713285 100644
--- a/Library/Homebrew/config.rb
+++ b/Library/Homebrew/config.rb
@@ -26,8 +26,9 @@ undef cache
 # Where brews installed via URL are cached
 HOMEBREW_CACHE_FORMULA = HOMEBREW_CACHE+"Formula"
 
-unless defined? HOMEBREW_BREW_FILE
-  HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] || which("brew").to_s
+HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"]
+unless HOMEBREW_BREW_FILE
+  odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
 end
 
 # Where we link under
diff --git a/Library/brew.rb b/Library/brew.rb
index 36dd901a57..754102c2ab 100755
--- a/Library/brew.rb
+++ b/Library/brew.rb
@@ -2,8 +2,6 @@
 
 std_trap = trap("INT") { exit! 130 } # no backtrace thanks
 
-HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"]
-
 require "pathname"
 HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent.join("Homebrew")
 $:.unshift(HOMEBREW_LIBRARY_PATH.to_s)