diff --git a/build.cake b/build.cake
index e75950326d..4ca75e1bb1 100644
--- a/build.cake
+++ b/build.cake
@@ -142,6 +142,7 @@ Task("Build")
         MSBuild(parameters.MSBuildSolution, settings => {
             settings.SetConfiguration(parameters.Configuration);
             settings.WithProperty("Platform", "\"" + parameters.Platform + "\"");
+            settings.WithProperty("UseRoslynPathHack", "true");
             settings.SetVerbosity(Verbosity.Minimal);
             settings.WithProperty("Windows", "True");
             settings.UseToolVersion(MSBuildToolVersion.VS2017);
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index cef2a2cdd6..b763aad8f3 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -159,4 +159,7 @@
     <PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
+  <PropertyGroup Condition="'$(UseRoslynPathHack)' == ''">
+    <CscToolPath>$(MSBuildToolsPath)\Roslyn</CscToolPath>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Shared/nuget.workaround.targets b/src/Shared/nuget.workaround.targets
index 4490fd8375..bf6b71ddba 100644
--- a/src/Shared/nuget.workaround.targets
+++ b/src/Shared/nuget.workaround.targets
@@ -57,7 +57,7 @@
       <Output TaskParameter="Include" ItemName="%(_NuGetContentItems.NuGetItemType)" />
     </CreateItem>
   </Target>
-  <PropertyGroup>
-    <CscToolPath Condition="!Exists('$(CscToolPath)')">$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
+  <PropertyGroup Condition="'$(UseRoslynPathHack)' == 'true'">
+    <CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
   </PropertyGroup>
 </Project>
\ No newline at end of file