reverted withdraw must be the client's last
Merge branch 'fix-only-revert-last'