Revert "Merge branch 'add_token' into develop"

This reverts commit 80314dfb1ad0a3ac9b2d78bd292d266026c517b1, reversing
changes made to 4ee3ba34f738348bfb87845f68c0f62c71279de8.