Revert to standard TDT kernel
Some minor changes...