Revert "Fix memory leaks"

This reverts commit 12586d1c216c52efbfd2265d240147b1c31fe543.

Change-Id: I3cdb236b5578695d4b0ee6ba2478326e630362d9
(cherry picked from commit a667247278c732c5317a8fce670c50d42e4a4db0)
1 file changed