Backout 0b0a0b491740 (bug 881634) for causing crashes on android CLOSED TREE