50a7279ae6
This reverts commit cde962dcb7.
Fixes: 355666644
Reason for revert: Memory leak b/355666644
Change-Id: I2eee00d2d8d65e1e1805ad76fafc7caab8626715