This reverts commit ac507102. reverting while we figuere out why one of the green dragon lldb test fails.