Back out "leak" fixes, as it causes segfaults