Revert "Revert "[debug] tweak""

This reverts commit 6b244f96bc08a4c0d45842c52d348e80890d8aea.