Merge "Revert "Add support for the new unwind method.""
am: 0d2cac9ea8

Change-Id: I68903c1641ee0d439dc5f839b968cff4b739dd84