Back out c50503ce8669 (bug 883495) for still leaking
CLOSED TREE