Restored tgsh to have a clean merge.