Revert "Revert "Disable TNT""