diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 3cff6eb96a..c0cf397925 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -203,11 +203,6 @@ if [[ "${ACTION}" == "upgrade" ]]; then
     # Checkout the original HEAD we started with
     git checkout ${UPGRADE_TARGET_BRANCH}
 
-    # There is a protection in the run-upgrade script
-    # to prevent people doing anything silly. We need
-    # to bypass that for an automated test.
-    export I_REALLY_KNOW_WHAT_I_AM_DOING=true
-
     # Unset environment variables used by the bootstrap-ansible
     # script to allow newer versions of Ansible and global
     # requirements to be installed.
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index 8abe270615..b957284fb5 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -20,7 +20,7 @@
 
 ## Shell Opts ----------------------------------------------------------------
 
-set -e -u -v
+set -e -u
 
 ## Vars ----------------------------------------------------------------------
 
@@ -33,9 +33,6 @@ export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")"
 # The path to find all the upgrade playbooks
 export UPGRADE_PLAYBOOKS="${SCRIPTS_PATH}/upgrade-utilities/playbooks"
 
-# The toggle which guards against using this script prematurely
-export I_REALLY_KNOW_WHAT_I_AM_DOING=${I_REALLY_KNOW_WHAT_I_AM_DOING:-"false"}
-
 # The expected source series name
 export SOURCE_SERIES="ocata"
 
@@ -127,12 +124,21 @@ function pre_flight {
     # Notify the user.
     echo -e "
     This script will perform a ${SOURCE_SERIES^} to ${TARGET_SERIES^} upgrade.
-    Once you start the upgrade there's no going back.
+    Once you start the upgrade there is no going back.
 
     Note that the upgrade targets impacting the data
     plane as little as possible, but assumes that the
     control plane can experience some down time.
 
+    This script executes a one-size-fits-all upgrade,
+    and given that the tests implemented for it are
+    not monitored as well as those for a greenfield
+    environment, the results may vary with each release.
+
+    Please use it against a test environment with your
+    configurations to validate whether it suits your
+    needs and does a suitable upgrade.
+
     Are you ready to perform this upgrade now?
     "
 
@@ -145,20 +151,9 @@ function pre_flight {
     fi
 }
 
-function exit_early {
-    echo -e "
-    The upgrade script is still under active development and should not be
-    run at this time. For test environments the early exit of the script can
-    skipped by executing ``export I_REALLY_KNOW_WHAT_I_AM_DOING=true`` before
-    ``run-upgrade.sh``.
-    "
-    exit 99
-}
-
 ## Main ----------------------------------------------------------------------
 
 function main {
-    [[ "${I_REALLY_KNOW_WHAT_I_AM_DOING}" = true ]] || exit_early
     pre_flight
     check_for_current