diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 1f3844f6c8..84b7d69ccd 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -3471,8 +3471,6 @@ function rel_canonical() {
  *
  * @since 3.0.0.
  *
- * @global WP_Query $wp_query
- *
  * @param int    $id          A post or blog id. Default is 0, which means the current post or blog.
  * @param string $context     Whether the id is a 'blog' id, 'post' id, or 'media' id.
  *                            If 'post', the post_type of the post is consulted.
@@ -3497,13 +3495,13 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
 	 */
 	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
 
-	if ( false !== $shortlink )
+	if ( false !== $shortlink ) {
 		return $shortlink;
+	}
 
-	global $wp_query;
 	$post_id = 0;
 	if ( 'query' == $context && is_singular() ) {
-		$post_id = $wp_query->get_queried_object_id();
+		$post_id = get_queried_object_id();
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7751116494..fbb2af94f5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34444';
+$wp_version = '4.4-alpha-34445';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.