Revert "Fix memory leaks"

This reverts commit 39f4bc12d049acec9bf8a665f362b8a18ad14f6f.

Reason for revert: not the right fix

Change-Id: I6b6150f6a7c0df6517406a4c385b153fec839c3a
1 file changed