diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index b35260349f..6b7534c419 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -91,4 +91,14 @@ text-align: center;
 }
 endif;
 
+/**
+ * @deprecated 3.0
+ */
+function get_current_user_id() {
+	_deprecated_function( __FUNCTION__, '3.0', '' );
+
+	global $current_user;
+	return $current_user->ID;
+}
+
 ?>
\ No newline at end of file
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 574b6fdefd..08f97f4569 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -249,12 +249,6 @@ function update_blog_details( $blog_id, $details = array() ) {
 	return true;
 }
 
-// @todo move to user.php
-function get_current_user_id() {
-	global $current_user;
-	return $current_user->ID;
-}
-
 /**
  * Retrieve option value based on setting name and blog_id.
  *