Merge "Revert "Test that we can unwind framework code.""