Revert rr271190, it was based on a misunderstanding.  The problem of
non-existant device<->xref info needs to be handled by creating the info,
which will come in a subsequent commit.