This reverts commit ad50ce83. Bug: 183237575 Reason for revert: Breaks stack unwinding Change-Id: I256dc77525687fb3e670355587b1eac72158b274