The system where we had that didn't have USB as sole local storage; it was one of them and it just happened to be the first one found by the old code, hence this patch to do a first pass ignoring USB devices. I guess cases might exist where it makes sense to have the second pass allowing USB devices.