This reverts commit 0d9b9152. This change broke LLDB's build. I will need to recommit after fixing LLDB.