041de0ba78
This reverts commit 194768420d.
Reason for revert: Memory leak has now been fixed
Fix: 358364342
Change-Id: I39e80d56a2c99ccb69d8de5170fd3e515bdef25b