diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index b93fff0117..0b8147483b 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -440,13 +440,6 @@ curl_version_output="$("$HOMEBREW_CURL" --version 2>/dev/null)"
 curl_name_and_version="${curl_version_output%% (*}"
 HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT ${curl_name_and_version// //}"
 
-# Declared in bin/brew
-export HOMEBREW_BREW_FILE
-export HOMEBREW_PREFIX
-export HOMEBREW_REPOSITORY
-export HOMEBREW_LIBRARY
-
-# Declared in brew.sh
 export HOMEBREW_VERSION
 export HOMEBREW_DEFAULT_CACHE
 export HOMEBREW_CACHE
diff --git a/bin/brew b/bin/brew
index d93497ef3e..123dee10e9 100755
--- a/bin/brew
+++ b/bin/brew
@@ -75,6 +75,11 @@ do
   export "$VAR_NEW"="${!VAR}"
 done
 
+export HOMEBREW_BREW_FILE
+export HOMEBREW_PREFIX
+export HOMEBREW_REPOSITORY
+export HOMEBREW_LIBRARY
+
 # Use VISUAL if HOMEBREW_EDITOR and EDITOR are unset.
 if [[ -z "$HOMEBREW_EDITOR" && -n "$VISUAL" ]]
 then