diff --git a/.gitmodules b/.gitmodules
index 7623451119..f9f7a7572f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,10 +58,6 @@
 	path = modules/MetaPackages
 	url = https://github.com/aspnet/MetaPackages.git
 	branch = master
-[submodule "modules/MusicStore"]
-	path = modules/MusicStore
-	url = https://github.com/aspnet/MusicStore.git
-	branch = master
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
diff --git a/build/buildorder.props b/build/buildorder.props
index 88db303dfe..c13d8e9627 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -30,7 +30,7 @@
     <RepositoryBuildOrder Include="Identity" Order="15" />
     <RepositoryBuildOrder Include="JavaScriptServices" 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 f10ee25d3c..44b8fea90f 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -63,7 +63,7 @@
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions"  RootPath="$(RepositoryRoot)src\MusicStore"/>
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
 </Project>
diff --git a/modules/MusicStore b/modules/MusicStore
deleted file mode 160000
index 2b0ea782be..0000000000
--- a/modules/MusicStore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2b0ea782be84655f9d6320b591efcb6dc1a38177