undo deviceId problem

revert latest change, which was not correct.