Backing out bug 1060138 due to leaks.