Reintroduce behavior that entering the single-step debugger does not bug out when in the middle of executing code.
Authored by: debug 2021-03-09
Parent: [r6388]
Child: [r6390]
