Merge "(bug 35993) gettoken should go die in a fire (part 1)"