Backout 645bf43f8f14 (bug 818575) for crashes on Android on a CLOSED TREE