This reverts commit78dea0e8fb. The offending lldb test (which is a real bug exposed by this patch) has been disabled on windows (seea67b2faa7c) and lldb is queued for inclusion into precommit testing, which would have caught this. Differential Revision: https://reviews.llvm.org/D80389