Revert "Don't assume device IDs won't collide."

This reverts commit ef5b656f2396aaaa26c42d4ebc16b950adb10baf.