was this a deliberate change to move this tracing out of the cs-protected state check?