This reverts commit 4328b960. reverting while we figure out why one of the Greendragon lldb tests fails.