Comment 362 for bug 269904

Bug 1418264 has absolutely nothing to do with the changes for the bug. Re-marking verification-needed.