This reverts commit 9a90c961.
This introduces double free
I tend to prefer a memleak as a race condition rather than a crash