Back out 7e0ffa0535cc for Android startup crashes on a CLOSED TREE.