diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 84ae7febb9..bd4f5c1107 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -92,7 +92,7 @@ function get_id_from_blogname( $slug ) {
 		return $blog_id;
 
 	if ( is_subdomain_install() ) {
-		$domain = $slug . '.' . $current_site->domain;
+		$domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
 		$path = $current_site->path;
 	} else {
 		$domain = $current_site->domain;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a12b78c317..e1026a8e5d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38657';
+$wp_version = '4.7-alpha-38658';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.