diff --git a/build/Compile.targets b/build/Compile.targets
index 8f85f1763..c1be8f877 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -16,35 +16,25 @@
                                            GetNuGetPackagesArchive;" />
 
   <Target Name="CompileCLI">
-      <ItemGroup>
-        <SharedFramework Remove="*" />
-        <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
-
-        <RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
-        <RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
-
-        <RuntimeAssetsToRemoveFromDeps Remove="*" />
-        <RuntimeAssetsToRemoveFromDeps Include="redist" />
-        <RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
-        <RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
-      </ItemGroup>
-
-      <RemoveDir Directories="$(StageDirectory)" />
-      <MakeDir Directories="$(StageDirectory)"/>
-
-      <!-- CopySharedFramework -->
-      <Copy SourceFiles="@(SharedFramework)"
-            DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Workaround for https://github.com/dotnet/sdk/issues/115 -->
     <ItemGroup>
-      <HackFilesToCopy Include="$(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.0\**;
-                                $(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.1\**;
-                                $(NuGetPackagesDir)\microsoft.codeanalysis.build.tasks\$(CLI_Roslyn_Version)\contentFiles\any\any\**;
-                                $(NuGetPackagesDir)\microsoft.testplatform.cli\$(CLI_TestPlatform_Version)\contentFiles\any\any\**" />
+      <SharedFramework Remove="*" />
+      <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
+
+      <RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
+      <RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
+
+      <RuntimeAssetsToRemoveFromDeps Remove="*" />
+      <RuntimeAssetsToRemoveFromDeps Include="redist" />
+      <RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
+      <RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
     </ItemGroup>
-    <Copy SourceFiles="@(HackFilesToCopy)"
-          DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <RemoveDir Directories="$(StageDirectory)" />
+    <MakeDir Directories="$(StageDirectory)"/>
+
+    <!-- CopySharedFramework -->
+    <Copy SourceFiles="@(SharedFramework)"
+          DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
 
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj
index af6b13ecb..54bd40c4c 100644
--- a/src/tool_msbuild/tool_msbuild.csproj
+++ b/src/tool_msbuild/tool_msbuild.csproj
@@ -9,4 +9,4 @@
     <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
     <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
index a252eaebb..66a54522f 100644
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -25,17 +25,6 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
-  
-  <Target Name="AddHackFilesToPublish" 
-          AfterTargets="ComputeFilesToPublish">
-    <ItemGroup>
-      <!-- Workaround for https://github.com/dotnet/sdk/issues/115 -->
-      <HackFilesToCopy Include="$(NuGetPackagesDir)\microsoft.codeanalysis.build.tasks\$(CLI_Roslyn_Version)\contentFiles\any\any\**;" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(HackFilesToCopy)"
-        DestinationFiles="@(HackFilesToCopy->'$(PublishDir)/%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
 
   <Target Name="MakeCscRunnableAndMoveToPublishDir"
           AfterTargets="Publish"