Start of applying patch so s3cmd can work in parallel