This reverts commit 7417ce97. Reason for revert: Breaks debug mode Bug: 119800099 Bug: 126239181 Change-Id: I2d4a79f957a020cc6404a130536a416daebc94e3