Back out 1cbb486b4fb7:8e3a17767287 (bug 906990) for leaks
CLOSED TREE