Don't require the device to actually be loaded.

No need to have the device loaded if we already know the info we need.
Merge branch 'master' into horde_5_2