Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 13649)
+++ wp-includes/default-filters.php	(working copy)
@@ -191,8 +191,8 @@
 add_action( 'wp_head',             'wp_generator'                         );
 add_action( 'wp_head',             'rel_canonical'                        );
 add_action( 'wp_footer',           'wp_print_footer_scripts'              );
-add_action( 'wp_head',             'wp_shortlink_wp_head'                 );
-add_action( 'wp',                  'wp_shortlink_header'                  );
+add_action( 'wp_head',             'wp_shortlink_wp_head',          10, 0 );
+add_action( 'template_redirect',   'wp_shortlink_header',           11, 0 );
 
 // Feed Generator Tags
 foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {