Fix rollback to avoid race conditions with multiple people trying to revert after...