diff --git a/build-tools/branching/create_branches_and_tags.sh b/build-tools/branching/create_branches_and_tags.sh
index 7a654e20..1f7b6a7d 100755
--- a/build-tools/branching/create_branches_and_tags.sh
+++ b/build-tools/branching/create_branches_and_tags.sh
@@ -386,9 +386,12 @@ for subgit in $SUBGITS; do
     fi
 
     extra_args=""
-    if [ "${remote_branch}" != "" ]; then
-        extra_args="-t ${remote}/${remote_branch}"
-    fi
+    # I don't think we ever want to do this.
+    # Certainly not as an automatic behaviour.
+    # We should only branch from the current HEAD by default.
+    # if [ "${remote_branch}" != "" ]; then
+    #     extra_args="-t ${remote}/${remote_branch}"
+    # fi
 
     # check if destination branch already exists
     branch_check=$(git branch -a --list $branch)
@@ -468,7 +471,8 @@ if [ $MANIFEST -eq 1 ]; then
     fi
 
     echo "Creating branch '$branch' in ${new_manifest_dir}"
-    git checkout -t ${remote}/${remote_branch} -b $branch
+    # git checkout -t ${remote}/${remote_branch} -b $branch
+    git checkout -b $branch
     if [ $? != 0 ] ; then
         echo_stderr "ERROR: failed to create branch '$branch' in ${new_manifest_dir}"
         exit 1