Backed out changeset 089871cdaf1e (bug 865004) because of crashtest leaks on a CLOSED TREE