Backed out changeset 6580ca3028de (bug 845546) for B2G xpcshell failures on a CLOSED TREE.