diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 646918f4cd5..049a4172899 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -5,7 +5,8 @@ on: [push]
 jobs:
   BuildDebug:
 
-    runs-on: [self-hosted, VSPreview]
+    # runs-on: [self-hosted, VSPreview]
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v1
@@ -23,18 +24,18 @@ jobs:
         name: WPF_Debug
         path: ./artifacts/packages/Debug/NonShipping
 
-  BuildRelease:
+  # BuildRelease:
 
-    runs-on: [self-hosted, VSPreview]
+  #   runs-on: [self-hosted, VSPreview]
 
-    steps:
-    - uses: actions/checkout@v1
-    - name: Build
-      run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
-    - name: Build CustomWPF
-      run: dotnet build CustomWpf -c Release
-    - name: Push
-      uses: actions/upload-artifact@v1
-      with:
-        name: WPF_Release
-        path: ./artifacts/packages/Release/NonShipping
+  #   steps:
+  #   - uses: actions/checkout@v1
+  #   - name: Build
+  #     run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
+  #   - name: Build CustomWPF
+  #     run: dotnet build CustomWpf -c Release
+  #   - name: Push
+  #     uses: actions/upload-artifact@v1
+  #     with:
+  #       name: WPF_Release
+  #       path: ./artifacts/packages/Release/NonShipping
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index e489910eaaf..eb0df2d379e 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -107,10 +107,10 @@
     <ManagedCxxSuppressions>$(ManagedCxxSuppressions);4995</ManagedCxxSuppressions>
   </PropertyGroup>
 
-  <PropertyGroup>
+<!--   <PropertyGroup>
     <UsePrivateCppTools Condition="'$(UsePrivateCppTools)' == ''">false</UsePrivateCppTools>
   </PropertyGroup>
-  <Import Project="Wpf.Cpp.PrivateTools.props" Condition="Exists('Wpf.Cpp.PrivateTools.props') And '$(UsePrivateCppTools)'=='true'"/>
+  <Import Project="Wpf.Cpp.PrivateTools.props" Condition="Exists('Wpf.Cpp.PrivateTools.props') And '$(UsePrivateCppTools)'=='true'"/> -->
   
   <!-- Set up standard libraries for Native C++ projects -->
   <PropertyGroup>