Backing out bug a06771fa469d from bug 1075658 for leaks.