memory leak solved (probably)
Revert "memory leak solved (probably)"

This reverts commit 9dc7035487abc899dbca622257acdfdc11721b4b.