Stash instead of revert