Bug 407741 - part 2