[Debug] tweak for #6474

This keeps the previous behavior as described in the comment.