Revert "commontoken"

This reverts commit 0311057a498fbfbefe9f4e47ffef777a978b68ee.