diff --git a/.gitmodules b/.gitmodules
index 28556811ab..afd606d012 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
 	branch = release/2.1
-[submodule "modules/AuthSamples"]
-	path = modules/AuthSamples
-	url = https://github.com/aspnet/AuthSamples.git
-	branch = release/2.1
 [submodule "modules/AzureIntegration"]
 	path = modules/AzureIntegration
 	url = https://github.com/aspnet/AzureIntegration.git
diff --git a/build/buildorder.props b/build/buildorder.props
index b450d1ecd6..1bacc3f869 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -36,7 +36,7 @@
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
-    <RepositoryBuildOrder Include="AuthSamples" Order="16" />
+    <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
     <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 32d9787d6e..cd47e1b33a 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -42,7 +42,7 @@
     <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
 
     <!-- Test-only repos -->
-    <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\AuthSamples\" />
     <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
diff --git a/modules/AuthSamples b/modules/AuthSamples
deleted file mode 160000
index d861b70515..0000000000
--- a/modules/AuthSamples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d861b7051505fe3f86d1498fd065e98cdd602313