Revert one of the previous memory leaks as it breaks multi-threading.
I need to find a more suitable way to solve this. The memory leak is
back, but it's tiny; essentially leaking the last (empty) container.