[PATCH 04/13] Correct handling of disks with hidden formats. (#866519)