lldb buildbot failure. will investigate and roll forward. This reverts commit 9f37775472b45986b0ecce5243bd6ce119e5bd69.