Revert "Fixed commit 582e867"

This reverts commit f3d6062adc725897a6d9b7f53d5a8ce6036715bb.
Revert "Fix possible memory leak"

This reverts commit 582e8679be07c2962af3f0d0ee2aac11cdab95cf.