diff --git a/src/Workspaces/Core/Portable/Options/ExportOptionAttribute.cs b/src/Workspaces/Core/Desktop/Options/ExportOptionAttribute.cs
similarity index 91%
rename from src/Workspaces/Core/Portable/Options/ExportOptionAttribute.cs
rename to src/Workspaces/Core/Desktop/Options/ExportOptionAttribute.cs
index 246b54f5288a99e7ca4e52f5b1ddca78d1b094d6..83de7bdcb65d24cd74fdf7d4025fbdf0c8d2abba 100644
--- a/src/Workspaces/Core/Portable/Options/ExportOptionAttribute.cs
+++ b/src/Workspaces/Core/Desktop/Options/ExportOptionAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
-using System.Composition;
+using System.ComponentModel.Composition;
 
 namespace Microsoft.CodeAnalysis.Options
 {
diff --git a/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj b/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj
index 65609eee8bd14e4100d83a11d93529ce382f8eb4..df64dcfce5f9183ea004af5b57ba2769c037f997 100644
--- a/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj
+++ b/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj
@@ -85,6 +85,7 @@
     <Compile Include="..\..\..\Compilers\Helpers\GlobalAssemblyCacheHelpers\GacFileResolver.cs">
       <Link>InternalUtilities\GacFileResolver.cs</Link>
     </Compile>
+    <Compile Include="Options\ExportOptionAttribute.cs" />
     <Compile Include="InternalUtilities\FilePathUtilities.cs" />
     <Compile Include="Log\EtwLogger.cs" />
     <Compile Include="Log\RoslynEventSource.cs" />
diff --git a/src/Workspaces/Core/Portable/Editing/GenerationOptions.cs b/src/Workspaces/Core/Portable/Editing/GenerationOptions.cs
index 02319d323fd005e93db7ec9ed65026ec94a46e67..55a3398e1467dd2703d4d4849b820994b0030cb8 100644
--- a/src/Workspaces/Core/Portable/Editing/GenerationOptions.cs
+++ b/src/Workspaces/Core/Portable/Editing/GenerationOptions.cs
@@ -4,11 +4,10 @@
 
 namespace Microsoft.CodeAnalysis.Editing
 {
-    internal partial class GenerationOptions
+    internal class GenerationOptions
     {
         public const string FeatureName = "Organizer";
-
-        [ExportOption]
+         
         public static readonly PerLanguageOption<bool> PlaceSystemNamespaceFirst = new PerLanguageOption<bool>(FeatureName, "PlaceSystemNamespaceFirst", defaultValue: true);
     }
 }
diff --git a/src/Workspaces/Core/Portable/Editing/GenerationOptionsProvider.cs b/src/Workspaces/Core/Portable/Editing/GenerationOptionsProvider.cs
new file mode 100644
index 0000000000000000000000000000000000000000..8da6c62fdaf342bf450713087660ee51443d4fc3
--- /dev/null
+++ b/src/Workspaces/Core/Portable/Editing/GenerationOptionsProvider.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Options.Providers;
+
+namespace Microsoft.CodeAnalysis.Editing
+{
+    [ExportOptionProvider, Shared]
+    internal class GenerationOptionsProvider : IOptionProvider 
+    {
+        private IEnumerable<IOption> _options = ImmutableArray.Create<IOption>(
+                GenerationOptions.PlaceSystemNamespaceFirst
+                );
+
+        public IEnumerable<IOption> GetOptions()
+        {
+            return _options;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Workspaces/Core/Portable/Workspaces.csproj b/src/Workspaces/Core/Portable/Workspaces.csproj
index d04449a3cdad6f1d182b0f7eab0a9fa663136030..aaa0465c0cf31c79ed417f0c31dee31a227ab6da 100644
--- a/src/Workspaces/Core/Portable/Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Workspaces.csproj
@@ -326,6 +326,7 @@
     <Compile Include="CodeGeneration\INamedTypeSymbolExtensions.cs" />
     <Compile Include="CodeGeneration\LiteralSpecialValues.cs" />
     <Compile Include="Editing\GenerationOptions.cs" />
+    <Compile Include="Editing\GenerationOptionsProvider.cs" />
     <Compile Include="Editing\ImportAdder.cs" />
     <Compile Include="Editing\SolutionEditor.cs" />
     <Compile Include="Editing\SymbolEditor.cs" />
@@ -379,7 +380,6 @@
     <Compile Include="Log\LogAggregator.cs" />
     <Compile Include="Log\Logger.LogBlock.cs" />
     <Compile Include="Log\LogMessage.cs" />
-    <Compile Include="Options\ExportOptionAttribute.cs" />
     <Compile Include="Serialization\AssemblySerializationInfoService.cs" />
     <Compile Include="Serialization\IAssemblySerializationInfoService.cs" />
     <Compile Include="Shared\Extensions\TextDocumentExtensions.cs" />
@@ -928,4 +928,4 @@
     <Import Project="..\..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file