CONTRIB-5496 Restore: Handle inconsistent data from pre-1.9 DB scheme