bug 840124 - really fix the leaks this time