Backed out changeset 45f374858666 (bug 852891) for bad commit message referencing wrong bug. DONTBUILD