Backport fix to disk-list