diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh
index fba999e02..8e08703ce 100755
--- a/build_tools/git_version_gen.sh
+++ b/build_tools/git_version_gen.sh
@@ -21,9 +21,4 @@ else
     VN="$DEF_VER"
 fi
 
-# If the first param is --stdout, then output to stdout and exit.
-if test "$1" = '--stdout'
-then
-    echo "$VN"
-    exit 0
-fi
+echo "$VN"
diff --git a/build_tools/make_macos_pkg.sh b/build_tools/make_macos_pkg.sh
index d6f36f5c9..f9b73003d 100755
--- a/build_tools/make_macos_pkg.sh
+++ b/build_tools/make_macos_pkg.sh
@@ -49,7 +49,7 @@ if [ -n "$NOTARIZE" ] && [ -z "$API_KEY_FILE" ]; then
     usage
 fi
 
-VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
+VERSION=$(build_tools/git_version_gen.sh 2>/dev/null)
 
 echo "Version is $VERSION"
 
diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh
index e14a02caa..da288178f 100755
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -7,7 +7,7 @@
 set -e
 
 # Get the version
-VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
+VERSION=$(build_tools/git_version_gen.sh 2>/dev/null)
 
 prefix=fish-$VERSION
 path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar.xz
diff --git a/build_tools/make_vendor_tarball.sh b/build_tools/make_vendor_tarball.sh
index 33db06653..a80c7504b 100755
--- a/build_tools/make_vendor_tarball.sh
+++ b/build_tools/make_vendor_tarball.sh
@@ -26,7 +26,7 @@ fi
 wd="$PWD"
 
 # Get the version from git-describe
-VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
+VERSION=$(build_tools/git_version_gen.sh 2>/dev/null)
 
 # The name of the prefix, which is the directory that you get when you untar
 prefix="fish-$VERSION"
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 6ab42fab2..6e3ab0bf1 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -114,7 +114,7 @@ configure_file(fish.pc.in fish.pc.noversion @ONLY)
 add_custom_command(OUTPUT fish.pc
     COMMAND sed '/Version/d' fish.pc.noversion > fish.pc
     COMMAND printf "Version: " >> fish.pc
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh --stdout >> fish.pc
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh >> fish.pc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion)
 
diff --git a/cmake/MacApp.cmake b/cmake/MacApp.cmake
index afc86e95b..d006c2cad 100644
--- a/cmake/MacApp.cmake
+++ b/cmake/MacApp.cmake
@@ -26,7 +26,7 @@ add_executable(fish_macapp EXCLUDE_FROM_ALL
 # so cmake must be re-run after version changes for the app to be updated. But
 # generally this will be run by make_macos_pkg.sh which always re-runs cmake.
 execute_process(
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh --stdout
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh
     COMMAND cut -d- -f1
     OUTPUT_VARIABLE FISH_SHORT_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/doc_src/conf.py b/doc_src/conf.py
index 6fe07183a..4eba58e9d 100644
--- a/doc_src/conf.py
+++ b/doc_src/conf.py
@@ -119,7 +119,7 @@ issue_url = "https://github.com/fish-shell/fish-shell/issues"
 
 # From Cargo, or no build system.
 ret = subprocess.check_output(
-    ("../build_tools/git_version_gen.sh", "--stdout"), stderr=subprocess.STDOUT
+    ("../build_tools/git_version_gen.sh"), stderr=subprocess.STDOUT
 ).decode("utf-8")
 
 # The full version, including alpha/beta/rc tags