as it breaks the bots. This reverts r374609 (git commit 696d3cf8ad) llvm-svn: 374616
696d3cf8ad
lldb-server