Backout cc13b2fc76c0 (bug 843015) for crashes on Android and B2G