Revert "Merge branch 'token_fixes' into 'master'"
This reverts merge request !1417 (merged) Builds on older platforms fail. In ARC 7 the older platforms will no longer be supported. As tokens is a technological preview in ARC 6 we do not need this MR in ARC 6.