diff --git a/.gitmodules b/.gitmodules
index ed8ae26eba..972b9ce3f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,10 +38,6 @@
 	path = modules/CORS
 	url = https://github.com/aspnet/CORS.git
 	branch = release/2.1
-[submodule "modules/DataProtection"]
-	path = modules/DataProtection
-	url = https://github.com/aspnet/DataProtection.git
-	branch = release/2.1
 [submodule "modules/DependencyInjection"]
 	path = modules/DependencyInjection
 	url = https://github.com/aspnet/DependencyInjection.git
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index be43e8dc75..a97112a561 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -11,6 +11,9 @@
 
   <Target Name="GetRepoBatches" DependsOnTargets="GeneratePropsFiles;ComputeGraph">
     <ItemGroup>
+      <RepositoryBuildOrder Condition="'%(RootPath)' == ''">
+        <RootPath>$(SubmoduleRoot)%(Identity)\</RootPath>
+      </RepositoryBuildOrder>
       <BatchedRepository Include="$(MSBuildProjectFullPath)">
         <BuildGroup>%(RepositoryBuildOrder.Order)</BuildGroup>
         <Repository>%(RepositoryBuildOrder.Identity)</Repository>
diff --git a/build/buildorder.props b/build/buildorder.props
index 0c20ba10c9..c8b166f55b 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -1,4 +1,11 @@
 <Project>
+  <ItemDefinitionGroup>
+    <RepositoryBuildOrder>
+      <Order></Order>
+      <RootPath></RootPath>
+    </RepositoryBuildOrder>
+  </ItemDefinitionGroup>
+
   <ItemGroup>
     <RepositoryBuildOrder Include="Common" Order="1" />
     <RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
@@ -17,7 +24,7 @@
     <RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
     <RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
     <RepositoryBuildOrder Include="Hosting" Order="7" />
-    <RepositoryBuildOrder Include="DataProtection" Order="8" />
+    <RepositoryBuildOrder Include="DataProtection" Order="8" RootPath="$(RepositoryRoot)src\DataProtection\" />
     <RepositoryBuildOrder Include="KestrelHttpServer" Order="8" />
     <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
     <RepositoryBuildOrder Include="HttpSysServer" Order="8" />
@@ -47,7 +54,5 @@
     <RepositoryBuildOrder Include="SignalR" Order="16" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" />
     <RepositoryBuildOrder Include="Templating" Order="17" />
-
-    <RepositoryBuildOrder Update="@(RepositoryBuildOrder)" RootPath="$(SubmoduleRoot)%(Identity)" />
   </ItemGroup>
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 2a0bf13984..cc0a5c1603 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -57,7 +57,7 @@
     <ShippedRepository Include="Caching" />
     <ShippedRepository Include="Configuration" />
     <ShippedRepository Include="CORS" />
-    <ShippedRepository Include="DataProtection" />
+    <ShippedRepository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" />
     <ShippedRepository Include="DependencyInjection" />
     <ShippedRepository Include="Diagnostics" />
     <ShippedRepository Include="DotNetTools" />
diff --git a/modules/DataProtection b/modules/DataProtection
deleted file mode 160000
index b62bb5778b..0000000000
--- a/modules/DataProtection
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b62bb5778be59cbde9b2e6bbdef20f40eef42355
diff --git a/src/DataProtection/build/repo.props b/src/DataProtection/build/repo.props
new file mode 100644
index 0000000000..59ae0807d3
--- /dev/null
+++ b/src/DataProtection/build/repo.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <!-- TODO: temporary while we reorganize source code and refactor dependency management -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
+</Project>