Debug Bar does not have the action hooks we need to tie in at the right point.

Kludge it to get what we need.