thread step-in -r
This reverts commit ae3640e386. The new test is failing on the Windows LLDB buildbot.
ae3640e386