Revert "Memory Leak fix?"

This reverts commit e26fcb02c17cd118649b2de7201e55001d58fd4c.