* Revert "Set Id property on existing devices so we don't try to create a new one instead of updating existing. (#2420)"
This reverts commit 02e4b10ae86f7bec6beb3e9e9938a761d2f004fc.
* Revert "Update push token on login to allow multiple users on mobile devices (#2404)"
This reverts commit 24469e2267a7b77d18c518d1848ab9bfa70110cd.
* Added back test changes.