Revert "Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona"

This reverts commit 907697bbf4b836fa246233c04ea3a48baec9e6fb.


Master only