Revert "Tweaks to the analyzer_cli."

pkg/analysis_server/lib/src/domain_execution.dart

Index: pkg/analysis_server/lib/src/domain_execution.dart
diff --git a/pkg/analysis_server/lib/src/domain_execution.dart b/pkg/analysis_server/lib/src/domain_execution.dart
index 6b507c3a5f765d4748bbd8868d6505be14e41cea..29449c5b3fa450b6132c75885b2765fa63148135 100644
--- a/pkg/analysis_server/lib/src/domain_execution.dart
+++ b/pkg/analysis_server/lib/src/domain_execution.dart
@@ -159,24 +159,20 @@ class ExecutionDomainHandler implements RequestHandler {
    * Implement the 'execution.setSubscriptions' request.
    */
   Response setSubscriptions(Request request) {
-    if (server.options.enableNewAnalysisDriver) {
-      return new ExecutionSetSubscriptionsResult().toResponse(request.id);
+    List<ExecutionService> subscriptions =
+        new ExecutionSetSubscriptionsParams.fromRequest(request).subscriptions;
+    if (subscriptions.contains(ExecutionService.LAUNCH_DATA)) {
+      if (onFileAnalyzed == null) {
+        onFileAnalyzed = server.onFileAnalyzed.listen(_fileAnalyzed);
+        _reportCurrentFileStatus();
+      }
     } else {
-      List<ExecutionService> subscriptions =
-          new ExecutionSetSubscriptionsParams.fromRequest(request).subscriptions;
-      if (subscriptions.contains(ExecutionService.LAUNCH_DATA)) {
-        if (onFileAnalyzed == null) {
-          onFileAnalyzed = server.onFileAnalyzed.listen(_fileAnalyzed);
-          _reportCurrentFileStatus();
-        }
-      } else {
-        if (onFileAnalyzed != null) {
-          onFileAnalyzed.cancel();
-          onFileAnalyzed = null;
-        }
+      if (onFileAnalyzed != null) {
+        onFileAnalyzed.cancel();
+        onFileAnalyzed = null;
       }
-      return new ExecutionSetSubscriptionsResult().toResponse(request.id);
     }
+    return new ExecutionSetSubscriptionsResult().toResponse(request.id);
   }
 
   void _fileAnalyzed(ChangeNotice notice) {