Merge "Revert "Saving the stack state when you rotate.""