Bug 6723: Part 2.