Revert r2536 since it contained experimental debug code not appropriate to trunk.