Removed some debug code for bug #7337.