Comment 3 for bug 162437

Also affects the trunk.