K 10 svn:author V 2 bz K 8 svn:date V 27 2011-02-14T16:54:03.125863Z K 7 svn:log V 259 MFC r216466: Bring back (most of) NATM to avoid further bitrot after r186119. Keep three lines disabled which I am unsure if they had been used at all. This will allow us to seek testers and possibly bring it all back. Discussed with: rwatson END