Wip dz scrub fixes


That actual fix went in for bug  7517.  Reverting assert change and improving log output.