Backed out changeset 17b7d2222f14 (bug 855407) for likely causing leaks.