Back out 965fe5b195ab (bug 962670) for leaking