[PATCH] Revert some of the leak fixes