Removed some test code for bug #8073.