R1:e57bfbf421f4

Pull some debugging code back out of "master"

See D19778. This is a workaround for T13179 that landed by mistake.