Backed out changeset 9879665a17bb (bug 989875) for leaks