diff --git a/src/EditorFeatures/CSharpTest/Organizing/OrganizeUsingsTests.cs b/src/EditorFeatures/CSharpTest/Organizing/OrganizeUsingsTests.cs
index 39e5952dd8bc2..12d783f3e1a2f 100644
--- a/src/EditorFeatures/CSharpTest/Organizing/OrganizeUsingsTests.cs
+++ b/src/EditorFeatures/CSharpTest/Organizing/OrganizeUsingsTests.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.OrganizeImports;
 using Roslyn.Test.Utilities;
 using Xunit;
@@ -12,12 +14,13 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Organizing
 {
     public class OrganizeUsingsTests
     {
-        protected async Task CheckAsync(string initial, string final, bool specialCaseSystem, CSharpParseOptions options = null)
+        protected async Task CheckAsync(string initial, string final, bool placeSystemNamespaceFirst = false, CSharpParseOptions options = null)
         {
             using (var workspace = await TestWorkspace.CreateCSharpAsync(initial))
             {
                 var document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id);
-                var newRoot = await (await OrganizeImportsService.OrganizeImportsAsync(document, specialCaseSystem)).GetSyntaxRootAsync();
+                workspace.Options = workspace.Options.WithChangedOption(new OptionKey(GenerationOptions.PlaceSystemNamespaceFirst, document.Project.Language), placeSystemNamespaceFirst);
+                var newRoot = await (await OrganizeImportsService.OrganizeImportsAsync(document)).GetSyntaxRootAsync();
                 Assert.Equal(final.NormalizeLineEndings(), newRoot.ToFullString());
             }
         }
@@ -25,7 +28,7 @@ protected async Task CheckAsync(string initial, string final, bool specialCaseSy
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
         public async Task EmptyFile()
         {
-            await CheckAsync(string.Empty, string.Empty, true);
+            await CheckAsync(string.Empty, string.Empty);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -33,7 +36,7 @@ public async Task SingleUsingStatement()
         {
             var initial = @"using A;";
             var final = initial;
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -52,7 +55,7 @@ public async Task AliasesAtBottom()
 using D = E;
 ";
 
-            await CheckAsync(initial, final, false);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -77,7 +80,7 @@ public async Task UsingStaticsBetweenUsingsAndAliases()
 using D = E;
 ";
 
-            await CheckAsync(initial, final, false);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -162,7 +165,7 @@ namespace N5
     using N;
   } 
 }";
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -180,7 +183,7 @@ public async Task SpecialCaseSystem()
 using M1;
 using M2;
 ";
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final, placeSystemNamespaceFirst: true);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -202,7 +205,7 @@ public async Task SpecialCaseSystemWithUsingStatic()
 using static System.BitConverter;
 using static Microsoft.Win32.Registry;
 ";
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final, placeSystemNamespaceFirst: true);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -221,7 +224,7 @@ public async Task DoNotSpecialCaseSystem()
 using System.Linq;
 ";
 
-            await CheckAsync(initial, final, false);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -242,7 +245,7 @@ public async Task DoNotSpecialCaseSystemWithUsingStatics()
 using System.Linq;
 using static Microsoft.Win32.Registry;
 using static System.BitConverter;";
-            await CheckAsync(initial, final, false);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -276,7 +279,7 @@ namespace U { }
 namespace V.W { }
 namespace X.Y.Z { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -302,7 +305,7 @@ namespace B { }";
 namespace A { }
 namespace B { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -328,7 +331,7 @@ namespace B { }";
 namespace A { }
 namespace B { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -354,7 +357,7 @@ namespace B { }";
 namespace A { }
 namespace B { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")]
@@ -379,7 +382,7 @@ namespace B { }";
 namespace A { }
 namespace B { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")]
@@ -404,7 +407,7 @@ namespace B { }";
 namespace A { }
 namespace B { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")]
@@ -429,7 +432,7 @@ namespace B { }";
 namespace A { }
 namespace B { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")]
@@ -454,7 +457,7 @@ public async Task CommentsNotAtTheStartOfTheFile1()
     using System.Text;
 }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")]
@@ -481,7 +484,7 @@ public async Task CommentsNotAtTheStartOfTheFile2()
     using System.Text;
 }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -502,7 +505,7 @@ namespace C { }
 namespace D { }";
 
             var final = initial;
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -582,7 +585,7 @@ struct T { }
     }
 }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -594,7 +597,7 @@ public async Task DuplicateUsings()
 
             var final = initial;
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -614,7 +617,7 @@ public async Task InlineComments()
 /*00*/using/*01*/D/*02*/;/*03*/
 /*16*/";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -628,7 +631,7 @@ public async Task AllOnOneLine()
 using B; 
 using C; ";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -655,7 +658,7 @@ class Class1
 {
 }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -670,7 +673,7 @@ public async Task NestedRegionBlock()
 
             var final = initial;
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -687,7 +690,7 @@ public async Task MultipleRegionBlocks()
 
             var final = initial;
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -709,7 +712,7 @@ class D { }";
 
 class D { }";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -729,7 +732,7 @@ public async Task InsideIfEndIfBlock()
 using C;
 #endif";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -746,7 +749,7 @@ public async Task IfEndIfBlockAbove()
 using E;";
 
             var final = initial;
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -766,7 +769,7 @@ public async Task IfEndIfBlockMiddle()
 using G;";
 
             var final = initial;
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -783,7 +786,7 @@ public async Task IfEndIfBlockBelow()
 #endif";
 
             var final = initial;
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -822,7 +825,7 @@ public async Task Korean()
 using 하;
 ";
 
-            await CheckAsync(initial, final, true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -851,7 +854,7 @@ public async Task DoNotSpecialCaseSystem1()
 using SystemZ;
 ";
 
-            await CheckAsync(initial, final, specialCaseSystem: false);
+            await CheckAsync(initial, final, placeSystemNamespaceFirst: false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -894,7 +897,7 @@ public async Task DoNotSpecialCaseSystem2()
 using Z = System.Int32;
 ";
 
-            await CheckAsync(initial, final, specialCaseSystem: false);
+            await CheckAsync(initial, final, placeSystemNamespaceFirst: false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -987,7 +990,7 @@ public async Task CaseSensitivity1()
 
 // If Kana is sensitive あ != ア, if Kana is insensitive あ == ア.
 // If Width is sensitiveア != ｱ, if Width is insensitive ア == ｱ.";
-            await CheckAsync(initial, final, specialCaseSystem: true);
+            await CheckAsync(initial, final);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Organizing)]
@@ -1022,7 +1025,7 @@ public async Task CaseSensitivity2()
 using ああ;
 ";
 
-            await CheckAsync(initial, final, specialCaseSystem: true);
+            await CheckAsync(initial, final);
         }
     }
 }
diff --git a/src/EditorFeatures/Core/Implementation/Organizing/OrganizeDocumentCommandHandler.cs b/src/EditorFeatures/Core/Implementation/Organizing/OrganizeDocumentCommandHandler.cs
index 27568973b04b0..0ec49809cea3a 100644
--- a/src/EditorFeatures/Core/Implementation/Organizing/OrganizeDocumentCommandHandler.cs
+++ b/src/EditorFeatures/Core/Implementation/Organizing/OrganizeDocumentCommandHandler.cs
@@ -3,7 +3,6 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Threading;
-using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.Commands;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared;
@@ -12,7 +11,6 @@
 using Microsoft.CodeAnalysis.Organizing;
 using Microsoft.CodeAnalysis.RemoveUnnecessaryImports;
 using Microsoft.CodeAnalysis.Shared.Extensions;
-using Microsoft.CodeAnalysis.Shared.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Roslyn.Utilities;
@@ -123,7 +121,7 @@ private void SortAndRemoveUnusedImports(ITextBuffer subjectBuffer, CancellationT
             if (document != null)
             {
                 var newDocument = document.GetLanguageService<IRemoveUnnecessaryImportsService>().RemoveUnnecessaryImportsAsync(document, cancellationToken).WaitAndGetResult(cancellationToken);
-                newDocument = OrganizeImportsService.OrganizeImportsAsync(newDocument, subjectBuffer.GetFeatureOnOffOption(GenerationOptions.PlaceSystemNamespaceFirst), cancellationToken).WaitAndGetResult(cancellationToken);
+                newDocument = OrganizeImportsService.OrganizeImportsAsync(newDocument, cancellationToken).WaitAndGetResult(cancellationToken);
                 if (document != newDocument)
                 {
                     ApplyTextChange(document, newDocument);
diff --git a/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeImportsTests.vb b/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeImportsTests.vb
index a8bde6aa545b5..56c7f1bae8541 100644
--- a/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeImportsTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeImportsTests.vb
@@ -1,38 +1,40 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports System.Xml.Linq
+Imports Microsoft.CodeAnalysis.Editing
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
+Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.OrganizeImports
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Organizing
     Public Class OrganizeImportsTests
-        Private Async Function CheckAsync(initial As XElement, final As XElement, specialCaseSystem As Boolean) As Threading.Tasks.Task
+        Private Async Function CheckAsync(initial As XElement, final As XElement, Optional placeSystemNamespaceFirst As Boolean = False) As Task
             Using workspace = Await TestWorkspace.CreateVisualBasicAsync(initial.NormalizedValue)
                 Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id)
-                Dim newRoot = Await (Await OrganizeImportsService.OrganizeImportsAsync(document, specialCaseSystem)).GetSyntaxRootAsync()
-
+                workspace.Options = workspace.Options.WithChangedOption(New OptionKey(GenerationOptions.PlaceSystemNamespaceFirst, document.Project.Language), placeSystemNamespaceFirst)
+                Dim newRoot = Await (Await OrganizeImportsService.OrganizeImportsAsync(document)).GetSyntaxRootAsync()
                 Assert.Equal(final.NormalizedValue, newRoot.ToFullString())
             End Using
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
         Public Async Function TestEmptyFile() As Task
-            Await CheckAsync(<content></content>, <content></content>, True)
+            Await CheckAsync(<content></content>, <content></content>)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
         Public Async Function TestSingleImportsStatement() As Task
             Dim initial = <content>Imports A</content>
             Dim final = initial
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
         Public Async Function TestMultipleClauses() As Task
             Dim initial = <content>Imports C, B, A</content>
             Dim final = <content>Imports A, B, C</content>
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -50,7 +52,7 @@ Imports A = B
 Imports D = E
 </content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -65,7 +67,7 @@ Imports D
 Imports E
 Imports F
 </content>
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -82,7 +84,7 @@ Imports System.Linq
 Imports M1
 Imports M2
 </content>
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final, placeSystemNamespaceFirst:=True)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -100,7 +102,7 @@ Imports System
 Imports System.Linq
 </content>
 
-            Await CheckAsync(initial, final, False)
+            Await CheckAsync(initial, final, placeSystemNamespaceFirst:=False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -115,7 +117,7 @@ Imports A</content>
 Imports A
 Imports B
 </content>
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -140,7 +142,7 @@ Imports B
 namespace A { }
 namespace B { }</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -165,7 +167,7 @@ Imports B
 namespace A { }
 namespace B { }</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -194,7 +196,7 @@ end namespace
 namespace B
 end namespace</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")>
@@ -218,7 +220,7 @@ Imports B
 namespace A { }
 namespace B { }</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")>
@@ -242,7 +244,7 @@ Imports B
 namespace A { }
 namespace B { }</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <WorkItem(2480, "https://github.com/dotnet/roslyn/issues/2480")>
@@ -266,7 +268,7 @@ Imports B
 namespace A { }
 namespace B { }</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -286,7 +288,7 @@ namespace C { }
 namespace D { }</content>
 
             Dim final = initial
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -297,7 +299,7 @@ Imports A</content>
 
             Dim final = initial
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -316,7 +318,7 @@ Imports C '/*07*/
 Imports D '/*03*/
 </content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -336,7 +338,7 @@ Imports C
 #endregion
 </content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -350,7 +352,7 @@ Imports B</content>
 
             Dim final = initial
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -366,7 +368,7 @@ Imports B
 
             Dim final = initial
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -389,7 +391,7 @@ Imports C
 class D
 end class</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -408,7 +410,7 @@ Imports B
 Imports C
 #end if</content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -424,7 +426,7 @@ Imports A
 Imports E</content>
 
             Dim final = initial
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -443,7 +445,7 @@ Imports E
 Imports G</content>
 
             Dim final = initial
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -459,7 +461,7 @@ Imports F
 #end if</content>
 
             Dim final = initial
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -497,7 +499,7 @@ Imports 파
 Imports 하
 </content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -525,7 +527,7 @@ Imports System.Collections.Generic
 Imports SystemZ
 </content>
 
-            Await CheckAsync(initial, final, False)
+            Await CheckAsync(initial, final, placeSystemNamespaceFirst:=False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -548,7 +550,7 @@ Imports <xmlns:ab="http://NewNamespace">
 Imports <xmlns:zz="http://NextNamespace">
 ]]></content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -640,7 +642,7 @@ Imports ああ
 
 // If Kana is sensitive あ != ア, if Kana is insensitive あ == ア.
 // If Width is sensitiveア != ｱ, if Width is insensitive ア == ｱ.</content>
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.Organizing)>
@@ -674,7 +676,7 @@ Imports あｱ
 Imports ああ
 </content>
 
-            Await CheckAsync(initial, final, True)
+            Await CheckAsync(initial, final)
         End Function
     End Class
 End Namespace
diff --git a/src/Features/CSharp/Portable/OrganizeImports/CSharpOrganizeImportsService.cs b/src/Features/CSharp/Portable/OrganizeImports/CSharpOrganizeImportsService.cs
index 3a4c1141ab85c..2e780be9e89ef 100644
--- a/src/Features/CSharp/Portable/OrganizeImports/CSharpOrganizeImportsService.cs
+++ b/src/Features/CSharp/Portable/OrganizeImports/CSharpOrganizeImportsService.cs
@@ -3,6 +3,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.OrganizeImports;
 
@@ -11,9 +12,11 @@ namespace Microsoft.CodeAnalysis.CSharp.OrganizeImports
     [ExportLanguageService(typeof(IOrganizeImportsService), LanguageNames.CSharp), Shared]
     internal partial class CSharpOrganizeImportsService : IOrganizeImportsService
     {
-        public async Task<Document> OrganizeImportsAsync(Document document, bool placeSystemNamespaceFirst, CancellationToken cancellationToken)
+        public async Task<Document> OrganizeImportsAsync(Document document, CancellationToken cancellationToken)
         {
             var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
+            var placeSystemNamespaceFirst = options.GetOption(GenerationOptions.PlaceSystemNamespaceFirst);
             var rewriter = new Rewriter(placeSystemNamespaceFirst);
             var newRoot = rewriter.Visit(root);
 
diff --git a/src/Features/Core/Portable/OrganizeImports/IOrganizeImportsService.cs b/src/Features/Core/Portable/OrganizeImports/IOrganizeImportsService.cs
index 1b5972bc8728f..42b988fa84095 100644
--- a/src/Features/Core/Portable/OrganizeImports/IOrganizeImportsService.cs
+++ b/src/Features/Core/Portable/OrganizeImports/IOrganizeImportsService.cs
@@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis.OrganizeImports
 {
     internal interface IOrganizeImportsService : ILanguageService
     {
-        Task<Document> OrganizeImportsAsync(Document document, bool placeSystemNamespaceFirst, CancellationToken cancellationToken);
+        Task<Document> OrganizeImportsAsync(Document document, CancellationToken cancellationToken);
 
         string SortAndRemoveUnusedImportsDisplayStringWithAccelerator { get; }
     }
diff --git a/src/Features/Core/Portable/OrganizeImports/OrganizeImportsService.cs b/src/Features/Core/Portable/OrganizeImports/OrganizeImportsService.cs
index 713301dd9cc7c..253226483b329 100644
--- a/src/Features/Core/Portable/OrganizeImports/OrganizeImportsService.cs
+++ b/src/Features/Core/Portable/OrganizeImports/OrganizeImportsService.cs
@@ -8,9 +8,9 @@ namespace Microsoft.CodeAnalysis.OrganizeImports
 {
     internal static partial class OrganizeImportsService
     {
-        public static Task<Document> OrganizeImportsAsync(Document document, bool placeSystemNamespaceFirst = true, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<Document> OrganizeImportsAsync(Document document, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return document.GetLanguageService<IOrganizeImportsService>().OrganizeImportsAsync(document, placeSystemNamespaceFirst, cancellationToken);
+            return document.GetLanguageService<IOrganizeImportsService>().OrganizeImportsAsync(document, cancellationToken);
         }
     }
 }
diff --git a/src/Features/VisualBasic/Portable/OrganizeImports/VisualBasicOrganizeImportsService.vb b/src/Features/VisualBasic/Portable/OrganizeImports/VisualBasicOrganizeImportsService.vb
index c2c646b2c4974..6064935cc4844 100644
--- a/src/Features/VisualBasic/Portable/OrganizeImports/VisualBasicOrganizeImportsService.vb
+++ b/src/Features/VisualBasic/Portable/OrganizeImports/VisualBasicOrganizeImportsService.vb
@@ -1,9 +1,10 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports System.Composition
 Imports System.Threading
+Imports Microsoft.CodeAnalysis.Editing
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.OrganizeImports
-Imports System.Composition
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.OrganizeImports
     <ExportLanguageService(GetType(IOrganizeImportsService), LanguageNames.VisualBasic), [Shared]>
@@ -11,9 +12,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.OrganizeImports
         Implements IOrganizeImportsService
 
         Public Async Function OrganizeImportsAsync(document As Document,
-                                        placeSystemNamespaceFirst As Boolean,
                                         cancellationToken As CancellationToken) As Task(Of Document) Implements IOrganizeImportsService.OrganizeImportsAsync
             Dim root = Await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(False)
+            Dim options = Await document.GetOptionsAsync(cancellationToken).ConfigureAwait(False)
+            Dim placeSystemNamespaceFirst = options.GetOption(GenerationOptions.PlaceSystemNamespaceFirst)
             Dim rewriter = New Rewriter(placeSystemNamespaceFirst)
             Dim newRoot = rewriter.Visit(root)
             Return document.WithSyntaxRoot(newRoot)
diff --git a/src/VisualStudio/Xaml/Impl/Features/OrganizeImports/XamlOrganizeImportsService.cs b/src/VisualStudio/Xaml/Impl/Features/OrganizeImports/XamlOrganizeImportsService.cs
index b78dcc7f6f137..93f6f1329760a 100644
--- a/src/VisualStudio/Xaml/Impl/Features/OrganizeImports/XamlOrganizeImportsService.cs
+++ b/src/VisualStudio/Xaml/Impl/Features/OrganizeImports/XamlOrganizeImportsService.cs
@@ -3,6 +3,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.Xaml.Features.OrganizeImports;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.OrganizeImports;
@@ -21,9 +22,11 @@ public XamlOrganizeImportsService(IXamlOrganizeNamespacesService organizeService
             _organizeService = organizeService;
         }
 
-        public Task<Document> OrganizeImportsAsync(Document document, bool placeSystemNamespaceFirst, CancellationToken cancellationToken)
+        public async Task<Document> OrganizeImportsAsync(Document document, CancellationToken cancellationToken)
         {
-            return _organizeService.OrganizeNamespacesAsync(document, placeSystemNamespaceFirst, cancellationToken) ?? Task.FromResult(document);
+            var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
+            var placeSystemNamespaceFirst = options.GetOption(GenerationOptions.PlaceSystemNamespaceFirst);
+            return await _organizeService.OrganizeNamespacesAsync(document, placeSystemNamespaceFirst, cancellationToken).ConfigureAwait(false) ?? document;
         }
 
         public string SortAndRemoveUnusedImportsDisplayStringWithAccelerator