diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
index 914dab238..a44efdbb3 100644
--- a/lib/analyze-action-post.js
+++ b/lib/analyze-action-post.js
@@ -128369,7 +128369,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -128650,11 +128650,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/debug-artifacts.ts
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 86bafba5f..b15b7c2cc 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -92540,7 +92540,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -92821,11 +92821,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/autobuild.ts
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
index 970840e3a..2a637757d 100644
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -87543,7 +87543,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -87824,11 +87824,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/autobuild.ts
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index 68eec4613..6e75f3e39 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -133478,7 +133478,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -133759,11 +133759,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/debug-artifacts.ts
diff --git a/lib/init-action.js b/lib/init-action.js
index a506447d9..b87a46b4a 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -91452,7 +91452,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -91733,11 +91733,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/init.ts
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
index 3ea89969c..eebea393e 100644
--- a/lib/resolve-environment-action.js
+++ b/lib/resolve-environment-action.js
@@ -87175,7 +87175,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -87456,11 +87456,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/resolve-environment.ts
diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js
index addfda665..d3be98cdc 100644
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -88926,7 +88926,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -89207,11 +89207,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/init.ts
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index cccd12f29..7e4fc362c 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -91539,7 +91539,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -91820,11 +91820,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/fingerprints.ts
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index e03fd069f..a5be31444 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -92210,7 +92210,7 @@ ${output}`
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...await getJobRunUuidSarifOptions(this),
+        ...await getJobRunUuidSarifOptions(),
         ...getExtraOptionsFromEnv(["database", "interpret-results"])
       ];
       if (sarifRunPropertyFlag !== void 0) {
@@ -92491,11 +92491,9 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
     "-Dmaven.wagon.http.pool=false"
   ].join(" ");
 }
-async function getJobRunUuidSarifOptions(codeql) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env["JOB_RUN_UUID" /* JOB_RUN_UUID */];
-  return jobRunUuid && await codeql.supportsFeature(
-    "databaseInterpretResultsSupportsSarifRunProperty" /* DatabaseInterpretResultsSupportsSarifRunProperty */
-  ) ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
 
 // src/fingerprints.ts
diff --git a/src/codeql.ts b/src/codeql.ts
index 72fea765c..19f933c39 100644
--- a/src/codeql.ts
+++ b/src/codeql.ts
@@ -853,7 +853,7 @@ async function getCodeQLForCmd(
         "--sarif-group-rules-by-pack",
         "--sarif-include-query-help=always",
         "--sublanguage-file-coverage",
-        ...(await getJobRunUuidSarifOptions(this)),
+        ...(await getJobRunUuidSarifOptions()),
         ...getExtraOptionsFromEnv(["database", "interpret-results"]),
       ];
       if (sarifRunPropertyFlag !== undefined) {
@@ -1283,13 +1283,8 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
   ].join(" ");
 }
 
-async function getJobRunUuidSarifOptions(codeql: CodeQL) {
+async function getJobRunUuidSarifOptions() {
   const jobRunUuid = process.env[EnvVar.JOB_RUN_UUID];
 
-  return jobRunUuid &&
-    (await codeql.supportsFeature(
-      ToolsFeature.DatabaseInterpretResultsSupportsSarifRunProperty,
-    ))
-    ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`]
-    : [];
+  return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
 }
diff --git a/src/tools-features.ts b/src/tools-features.ts
index 6a88c4faa..ff87b754d 100644
--- a/src/tools-features.ts
+++ b/src/tools-features.ts
@@ -6,7 +6,6 @@ export enum ToolsFeature {
   BuiltinExtractorsSpecifyDefaultQueries = "builtinExtractorsSpecifyDefaultQueries",
   BundleSupportsIncludeOption = "bundleSupportsIncludeOption",
   BundleSupportsOverlay = "bundleSupportsOverlay",
-  DatabaseInterpretResultsSupportsSarifRunProperty = "databaseInterpretResultsSupportsSarifRunProperty",
   IndirectTracingSupportsStaticBinaries = "indirectTracingSupportsStaticBinaries",
   SuppressesMissingFileBaselineWarning = "suppressesMissingFileBaselineWarning",
 }