Revert last commit; preserve case of generic-device-id