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