--- swift/utils/build-presets.ini.orig	2019-08-16 22:08:50.000000000 -0500
+++ swift/utils/build-presets.ini	2019-08-21 21:26:01.340252697 -0500
@@ -730,7 +730,7 @@
 #===------------------------------------------------------------------------===#
 [preset: mixin_linux_install_components_with_clang]
 swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
-llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
+llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
 
 [preset: mixin_linux_installation]
 mixin-preset=
@@ -740,12 +740,9 @@
 llbuild
 swiftpm
 xctest
-libicu
-libcxx
 
 dash-dash
 
-build-ninja
 install-swift
 install-lldb
 install-llbuild
@@ -782,8 +779,8 @@
 test-optimized
 foundation
 libdispatch
-indexstore-db
-sourcekit-lsp
+indexstore-db=0
+sourcekit-lsp=0
 lit-args=-v --time-tests
 
 dash-dash
@@ -996,8 +993,8 @@
 xctest
 foundation
 libdispatch
-indexstore-db
-sourcekit-lsp
+indexstore-db=0
+sourcekit-lsp=0
 dash-dash
 
 install-swift