bug 846001 - don't clobber token. r=catlee