diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 2935d40cb..78077961a 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -193,7 +193,6 @@
                       '$(SdkMSBuildExtensionsNupkgFile)'" />
       
       <GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
-<<<<<<< HEAD
                                     OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> -->
       
     </Target>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 9261c166c..92ee7d8f6 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -21,9 +21,9 @@
                             PublishToolset;
                             PublishTemplates;
                             PublishLzmaArchive;
+                            CrossgenPublishDir;
                             PublishDotnetTools;
                             PublishVersionFile;
-                            CrossgenPublishDir;
                             PublishAppHostTemplate;
                             RetargetVSTestConsole;
                             GenerateMSBuildExtensions"
@@ -49,14 +49,12 @@
       <Toolset Remove="*" />
       <Toolset Include="$(ToolsetPublishDirectory)/**/*" />
 
-      <RefFilesToRemove Include="$(SdkOutputDirectory)/ref/**/*" />
+      <!-- Workaround for https://github.com/dotnet/toolset/issues/8 -->
+      <Toolset Remove="$(ToolsetPublishDirectory)/ref/**/*"/>
     </ItemGroup>
 
     <Copy SourceFiles="@(Toolset)"
           DestinationFiles="@(Toolset->'$(OutputDirectory)/sdk/$(ToolsetVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Workaround for https://github.com/dotnet/toolset/issues/8 -->
-    <Delete Files="@(RefFilesToRemove)" />
   </Target>
 
   <Target Name="PublishDotnetTools"
@@ -206,7 +204,7 @@
         DiasymReaderPath="@(DiasymReaderPath)"
         PlatformAssemblyPaths="@(PlatformAssemblies);@(FSharpFolders);$(SharedFrameworkNameVersionPath)" />
 
-    <!--<Crossgen
+    <Crossgen
         SourceAssembly="%(RemainingTargets.FullPath)"
         DestinationPath="%(RemainingTargets.FullPath)"
         JITPath="$(LibCLRJitPath)"
@@ -214,7 +212,7 @@
         ReadyToRun="True"
         CreateSymbols="$(CreateCrossgenSymbols)"
         DiasymReaderPath="@(DiasymReaderPath)"
-        PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />-->
+        PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />
   </Target>
 
   <Target Name="ChmodPublishDir"
@@ -226,6 +224,17 @@
     <Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
   </Target>
 
+  <Target Name="SeparateSymbolsFromPublishDir"
+          AfterTargets="CrossgenPublishDir">
+    <ItemGroup>
+      <PdbsToMove Include="$(PublishDir)/**/*.pdb" />
+      <PdbsToMove Include="$(PublishDir)/**/*.ni.*.map" />
+    </ItemGroup>
+
+    <Move SourceFiles="@(PdbsToMove)"
+          DestinationFiles="@(PdbsToMove->'$(SymbolsDirectory)/sdk/$(SdkVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+
   <Target Name="PublishTemplates">
     <ItemGroup>
       <TemplatesToBundle Include="$(RepoRoot)/build/BundledTemplates.proj">