Merge "Revert "Add support for the new unwind method.""