diff --git a/DEPS b/DEPS
index 03a1490126e..6dc77bacc7c 100644
--- a/DEPS
+++ b/DEPS
@@ -151,7 +151,7 @@ vars = {
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
   "json_rpc_2_rev": "509f71eef90ec5afb5486b69dab7fed97b9f1eef",
   "leak_tracker_rev": "56752316847e0ddd023650d35a9c7a5da1581d96",
-  "linter_rev": "655de5d0dc30cdd1df9ce4cd16bd7489106d987f", # disable rev_sdk_deps.dart
+  "linter_rev": "aed089e45c35221ce2b82f3757132031f0344b8b", # disable rev_sdk_deps.dart
   "lints_rev": "e03dc048796fa4bfb64c11eadcb44b5dc76a5757",
   "logging_rev": "521498757ed3eeae151c2d4796404e8947baa04c",
   "markdown_rev": "ee4e1b36f21a6815385b157f8fff12af28bdcf9a",
diff --git a/pkg/analysis_server/lib/src/services/correction/organize_imports.dart b/pkg/analysis_server/lib/src/services/correction/organize_imports.dart
index a23c83ddad9..8ec44256be3 100644
--- a/pkg/analysis_server/lib/src/services/correction/organize_imports.dart
+++ b/pkg/analysis_server/lib/src/services/correction/organize_imports.dart
@@ -358,6 +358,9 @@ class _DirectiveInfo implements Comparable<_DirectiveInfo> {
   /// https://github.com/dart-lang/linter/blob/658f497eef/lib/src/rules/directives_ordering.dart#L380-L387
   /// Consider finding a way to share this code!
   static int _compareUri(String a, String b) {
+    if (!a.startsWith('package:') || !b.startsWith('package:')) {
+      return a.compareTo(b);
+    }
     var indexA = a.indexOf('/');
     var indexB = b.indexOf('/');
     if (indexA == -1 || indexB == -1) return a.compareTo(b);