First try at using the new keep_removed option