Avoid showing the 'overwrite changes' dialog as a temporary workaround for #6437