Bug 852118 followup.  Fix the layout debugger to fix bustage