diff --git a/src/init-action.ts b/src/init-action.ts
index b6884dc34..a1af8b8c8 100644
--- a/src/init-action.ts
+++ b/src/init-action.ts
@@ -24,6 +24,7 @@ import {
   shouldRestoreCache,
 } from "./caching-utils";
 import { CodeQL } from "./codeql";
+import { resolveToolsInput } from "./config/resolve-tools-input";
 import * as configUtils from "./config-utils";
 import {
   DependencyCacheRestoreStatusReport,
@@ -58,7 +59,6 @@ import {
 } from "./overlay/caching";
 import { OverlayDatabaseMode } from "./overlay/overlay-database-mode";
 import { getRepositoryNwo } from "./repository";
-import { resolveToolsInput } from "./config/resolve-tools-input";
 import { ToolsSource } from "./setup-codeql";
 import {
   ActionName,
diff --git a/src/setup-codeql-action.ts b/src/setup-codeql-action.ts
index f31605f88..79215e477 100644
--- a/src/setup-codeql-action.ts
+++ b/src/setup-codeql-action.ts
@@ -11,6 +11,7 @@ import {
 import { AnalysisKind, getAnalysisKinds } from "./analyses";
 import { getGitHubVersion } from "./api-client";
 import { CodeQL } from "./codeql";
+import { resolveToolsInput } from "./config/resolve-tools-input";
 import { getRawLanguagesNoAutodetect } from "./config-utils";
 import { EnvVar } from "./environment";
 import { initFeatures } from "./feature-flags";
@@ -18,7 +19,6 @@ import { loadRepositoryProperties } from "./feature-flags/properties";
 import { initCodeQL } from "./init";
 import { getActionsLogger, Logger } from "./logging";
 import { getRepositoryNwo } from "./repository";
-import { resolveToolsInput } from "./config/resolve-tools-input";
 import { ToolsSource } from "./setup-codeql";
 import {
   ActionName,