Add back generic devices.