Merge "Revert "Overwrite files when extracting with unzip""