diff --git a/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp
index 4823f566bd7732..e5940d61f38a3e 100644
--- a/clang/lib/Basic/Version.cpp
+++ b/clang/lib/Basic/Version.cpp
@@ -23,10 +23,10 @@ namespace clang {
 
 std::string getClangRepositoryPath() {
 #if defined(CLANG_REPOSITORY_STRING)
-  return CLANG_REPOSITORY_STRING;
+  return "";
 #else
 #ifdef CLANG_REPOSITORY
-  return CLANG_REPOSITORY;
+  return "";
 #else
   return "";
 #endif
@@ -35,24 +35,18 @@ std::string getClangRepositoryPath() {
 
 std::string getLLVMRepositoryPath() {
 #ifdef LLVM_REPOSITORY
-  return LLVM_REPOSITORY;
-#else
   return "";
 #endif
 }
 
 std::string getClangRevision() {
 #ifdef CLANG_REVISION
-  return CLANG_REVISION;
-#else
   return "";
 #endif
 }
 
 std::string getLLVMRevision() {
 #ifdef LLVM_REVISION
-  return LLVM_REVISION;
-#else
   return "";
 #endif
 }
diff --git a/cmake/Modules/LLVMVersion.cmake b/cmake/Modules/LLVMVersion.cmake
index 897dd963bd9ab6..26c825e0c7bfee 100644
--- a/cmake/Modules/LLVMVersion.cmake
+++ b/cmake/Modules/LLVMVersion.cmake
@@ -10,6 +10,6 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
   set(LLVM_VERSION_PATCH 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
-  set(LLVM_VERSION_SUFFIX git)
+  set(LLVM_VERSION_SUFFIX "")
 endif()
 
diff --git a/lld/Common/Version.cpp b/lld/Common/Version.cpp
index 59183c79f7a3c8..0c13af54f5f90d 100644
--- a/lld/Common/Version.cpp
+++ b/lld/Common/Version.cpp
@@ -18,16 +18,5 @@
 // LLD 14.0.0 (https://github.com/llvm/llvm-project.git
 // 2d9759c7902c5cbc9a7e3ab623321d5578d51687)
 std::string lld::getLLDVersion() {
-#ifdef LLD_VENDOR
-#define LLD_VENDOR_DISPLAY LLD_VENDOR " "
-#else
-#define LLD_VENDOR_DISPLAY
-#endif
-#if defined(LLVM_REPOSITORY) && defined(LLVM_REVISION)
-  return LLD_VENDOR_DISPLAY "LLD " LLD_VERSION_STRING " (" LLVM_REPOSITORY
-                            " " LLVM_REVISION ")";
-#else
-  return LLD_VENDOR_DISPLAY "LLD " LLD_VERSION_STRING;
-#endif
-#undef LLD_VENDOR_DISPLAY
+return "LLD " LLD_VERSION_STRING;
 }