diff --git a/.gitmodules b/.gitmodules
index bedc913388..3a7a14987d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -66,10 +66,6 @@
 	path = modules/MetaPackages
 	url = https://github.com/aspnet/MetaPackages.git
 	branch = release/2.1
-[submodule "modules/MusicStore"]
-	path = modules/MusicStore
-	url = https://github.com/aspnet/MusicStore.git
-	branch = release/2.1
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
diff --git a/build/buildorder.props b/build/buildorder.props
index caabf76890..b11fe0d221 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -34,7 +34,7 @@
     <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
-    <RepositoryBuildOrder Include="MusicStore" Order="16" />
+    <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" />
     <RepositoryBuildOrder Include="Templating" Order="17" />
diff --git a/build/submodules.props b/build/submodules.props
index 52d15e9be0..840ee9b359 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -43,7 +43,7 @@
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
 
diff --git a/modules/MusicStore b/modules/MusicStore
deleted file mode 160000
index c14416f26f..0000000000
--- a/modules/MusicStore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c14416f26f3f575665d5142a4b9f677487cfcef4