diff --git a/vendorsetup.sh b/vendorsetup.sh
index 1f998cddb6fc84307679d2359d12c9d85eb1059b..0a0bfa99797dc9affc3aed5c09123410e5ee56f8 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -313,18 +313,6 @@ rungdb()
 }
 
 
-# Use a local B2G SDK if possible instead of downloading it
-if [[ -d prebuilts/b2g_sdk/$(uname)/.git ]]; then
-   export USE_LOCAL_XULRUNNER_SDK=1
-   export XULRUNNER_DIRECTORY="$(gettop)/prebuilts/b2g_sdk/$(uname)"
-else
-   echo =================================================================
-   echo Notice: Local B2G SDK was not found, fetching it now if necessary
-   echo =================================================================
-   make -s -C gaia b2g_sdk
-fi
-
-
 if [[ -z $1 ]]; then
    __patch_tree
 else
@@ -336,6 +324,17 @@ else
    esac
 fi
 
+# Use a local B2G SDK if possible instead of downloading it
+if [[ -d prebuilts/b2g_sdk/$(uname)/.git ]]; then
+   export USE_LOCAL_XULRUNNER_SDK=1
+   export XULRUNNER_DIRECTORY="$(gettop)/prebuilts/b2g_sdk/$(uname)"
+else
+   echo =================================================================
+   echo Notice: Local B2G SDK was not found, fetching it now if necessary
+   echo =================================================================
+   make -s -C gaia b2g_sdk
+fi
+
 # Don't build sources.xml
 export DISABLE_SOURCES_XML=true
 export LEGACY_USE_JAVA6=true