Revert "XX-11059 - Restore fails when device_version_id is NULL"

This reverts commit 77d5972b11d56e1c28d7e4824db8f3e12b765b19.