Remove the recent change that was targeted at avoiding memory leaks. It caused more problems than it fixed.