Revert "Split out tokenstore, configure with different port."

This reverts commit 44fa08001b458235b81cbe397bb9f55700c41e29.