Revert "make token strategy also require the prescense of the client"

This reverts commit 3a93b1140aaed25df8052025183f1a8ada2917ef.