You could revert this line, now that the breakpoint-crossing fix worked.