Revert "Merge pull request #2117 from NuGet/anurse/2116-skiptoken"

This reverts commit 4fe672e1dc8ea78b5dca287c628b06cde4b4198e, reversing
changes made to 3d7be0de883b337777d9e9a81794532ac3f27952.