No more 'war on terror'?