Analytics: add workaround for the token collision.

This is a workaround for issue #629. More info inline.