Revert of NDE & grand tournaments disabled again

Kept AnaxXiphos's new-style combat trait icons, though.

Not only did I test this successfully, but I did so in a more epic and hilarious manner than I could've hoped for; battlefield duels *definitely* work again.  I'll post a couple screenshots in the PB forum.