diff --git a/envsetup.sh b/envsetup.sh
index 06dadd3f38..84b06e1536 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -324,8 +324,6 @@ function set_stuff_for_environment()
 {
     set_lunch_paths
     set_sequence_number
-
-    export ANDROID_BUILD_TOP=$(gettop)
 }
 
 function set_sequence_number()
@@ -1178,4 +1176,4 @@ set_global_paths
 source_vendorsetup
 addcompletions
 
-
+export ANDROID_BUILD_TOP=$(gettop)