This reverts commit 6d3ad9d9fd830eef0ac8a9d558e826b8b624e17d. This was reverted because it broke the LLDB greendragon bot.