revert back to commit 65843cb (undoing "persistent getTokenTask v2" and "persistent getTokenTask")