+++ This bug was initially created as a clone of Bug #771350 +++
(This doesn't make any difference to the landing, but this landed with author as 'cbrocious@<snip>.com' rather than 'Firstname Lastname <firstname.lastname@example.org>'. Might want to fix your .hgrc so you get properly credited: https://developer.mozilla.org/en/Creating_a_patch_that_can_be_checked_in)
I landed for him, his .hgrc is correct.
Fixed problem that caused crash loop on device .... https://hg.mozilla.org/integration/mozilla-inbound/rev/d1a7f2918416
Would've been good to have been cc'd on this, what with having written the code that was removed (just to have saved a bit of time figuring out where it had gone).