Rename 'cleanup' to 'revert' for more obviousness.