diff --git a/.gitmodules b/.gitmodules
index 4ac3c4e48b..b328994a6b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -102,10 +102,6 @@
 	path = modules/MvcPrecompilation
 	url = https://github.com/aspnet/MvcPrecompilation.git
 	branch = release/2.2
-[submodule "modules/Options"]
-	path = modules/Options
-	url = https://github.com/aspnet/Options.git
-	branch = release/2.2
 [submodule "modules/Razor"]
 	path = modules/Razor
 	url = https://github.com/aspnet/Razor.git
diff --git a/build/CodeSign.props b/build/CodeSign.props
index 46c74c6137..55b5a7cfe4 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -40,6 +40,9 @@
       <FilesToSign Include="Microsoft.Extensions.FileProviders.Physical.dll"                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="Microsoft.Extensions.FileSystemGlobbing.dll"                    Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="Microsoft.Extensions.ObjectPool.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Options.ConfigurationExtensions.dll"       Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Options.DataAnnotations.dll"               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Options.dll"                               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="Microsoft.Extensions.Primitives.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
 
     <!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. -->
diff --git a/build/artifacts.props b/build/artifacts.props
index 7ed1e58869..e176e35291 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -215,9 +215,6 @@
     <PackageArtifact Include="Microsoft.Extensions.Logging.Testing" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.Logging.TraceSource" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Logging" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Options.ConfigurationExtensions" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Options.DataAnnotations" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Options" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.WebEncoders" Category="ship" />
     <PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" />
     <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 4ab4cdd087..766161e0e4 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <RepositoryBuildOrder Include="JsonPatch" Order="2" />
-    <RepositoryBuildOrder Include="Options" Order="4" />
     <RepositoryBuildOrder Include="DotNetTools" Order="4" />
     <RepositoryBuildOrder Include="Caching" Order="5" />
     <RepositoryBuildOrder Include="HtmlAbstractions" Order="5" />
diff --git a/build/dependencies.props b/build/dependencies.props
index cd0ea7d543..d42cc5589c 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -40,6 +40,9 @@
     <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
     <MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsOptionsPackageVersion>
     <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsPrimitivesPackageVersion>
     <MicrosoftExtensionsProcessSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsProcessSourcesPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 60f4c7bea5..b3fae958f2 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -56,6 +56,9 @@
     <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ValueStopwatch.Sources" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/build/submodules.props b/build/submodules.props
index 6ca6c0c2c9..f5fd966f7f 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -62,7 +62,6 @@
     <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
     <Repository Include="Mvc" />
     <Repository Include="MvcPrecompilation" />
-    <Repository Include="Options" />
     <Repository Include="Razor" />
     <Repository Include="ResponseCaching" />
     <Repository Include="Routing" />
diff --git a/modules/Options b/modules/Options
deleted file mode 160000
index a6d348bccb..0000000000
--- a/modules/Options
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a6d348bccbfd5a6b657383202da32e3f5f92f3ce