Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"