bug 865314 - backout 61ee2e053920 due to crashes 1089638 r=backout

--HG--
extra : rebase_source : a402ff7ab1f653320ac577807fbe85143d945af8