diff --git a/runrole b/runrole
index bcbaf191b..1f2ef14ff 100755
--- a/runrole
+++ b/runrole
@@ -22,6 +22,12 @@ if [[ $# -eq 0 ]] ; then
     exit 0
 fi
 
+if [ "$1" == "--reinstall" ]; then
+    ARGS="$ARGS --extra-vars reinstall=True"
+    REINSTALL=1
+    shift 1
+fi
+
 if ! grep -q "^""$1""_install: True" $LOCAL_VARS_FILE; then
     echo "ERROR: $LOCAL_VARS_FILE must contain '""$1""_install: True'"
     exit 1
@@ -41,12 +47,6 @@ clear_marker(){
     fi
 }
 
-if [ "$1" == "--reinstall" ]; then
-    ARGS="$ARGS --extra-vars reinstall=True"
-    REINSTALL=1
-    shift 1
-fi
-
 # Needed for Stages 1-3 if not installed yet
 if [ ! -f $IIAB_STATE_FILE ]; then
     touch $IIAB_STATE_FILE