diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index f320699c295..14585375352 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -173,6 +173,7 @@ extends:
                   /p:ManifestBuildNumber=$(Build.BuildNumber)
                   /p:VisualStudioDropName=Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
                   /p:GenerateSbom=true
+                  /p:RestoreInternalTooling=true
 
             steps:
             - task: NuGetCommand@2
@@ -203,6 +204,7 @@ extends:
                 -prepareMachine
                 -restore
                 -nobl
+                $(_BuildArgs)
               name: Restore
               displayName: Restore
               condition: succeeded()
diff --git a/eng/restore-internal-tools.yml b/eng/restore-internal-tools.yml
index 50e4fcf398e..9f47c52542b 100644
--- a/eng/restore-internal-tools.yml
+++ b/eng/restore-internal-tools.yml
@@ -11,22 +11,3 @@
       packageType: runtime
       version: 3.1.28
       installationPath: '$(Build.SourcesDirectory)\.dotnet'
-
-  # Needed because the build fails the NuGet Tools restore without it
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core sdk'
-    inputs:
-      packageType: sdk
-      useGlobalJson: true
-      workingDirectory: '$(Build.SourcesDirectory)'
-
-  # Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
-  - task: NuGetCommand@2
-    displayName: Restore internal tools
-    inputs:
-      command: restore
-      feedsToUse: config
-      restoreSolution: 'eng\common\internal\Tools.csproj'
-      nugetConfigPath: 'NuGet.config'
-      restoreDirectory: '$(Build.SourcesDirectory)\.packages'
-