Revert breakpoint removal optimization