Back out 89e99ecdf29f (bug 734691) for leaking
CLOSED TREE