diff --git a/.gitmodules b/.gitmodules
index 3a7a14987d..28556811ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -110,7 +110,3 @@
 	path = modules/StaticFiles
 	url = https://github.com/aspnet/StaticFiles.git
 	branch = release/2.1
-[submodule "modules/Templating"]
-	path = modules/Templating
-	url = https://github.com/aspnet/Templating.git
-	branch = release/2.1
diff --git a/build/buildorder.props b/build/buildorder.props
index b11fe0d221..b450d1ecd6 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -37,6 +37,6 @@
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" />
-    <RepositoryBuildOrder Include="Templating" Order="17" />
+    <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 59942bc7dd..32d9787d6e 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -39,7 +39,7 @@
     <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
     <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
     <Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
-    <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
diff --git a/modules/Templating b/modules/Templating
deleted file mode 160000
index 3f26b56fef..0000000000
--- a/modules/Templating
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3f26b56fefaa559d1ca9ba9181a249c0af26b9c3