Removed some test code for bug #7497.