Backed out changesets 5b30e3535be8 and 24081952b00e (bug 1023336) for crashes.

--HG--
extra : rebase_source : f9df1ab89163e2efdb46abeee9a0566ba2b3c571