This reverts commit adb5c23f8c. It surprisingly fails on a windows build bot: http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/18009
Will reland after some investigation and/or after adding some extra logging to help debug the issue.