This reverts commit 7179e892. Reason for revert: b/270693327 causing large memory use, revert until we have a workaround Change-Id: If36d6aff6a400ebcfd06aac2d1668de07e90152f