diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 8436426b14..b607362832 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -95,16 +95,6 @@ text-align: center;
 }
 endif;
 
-/**
- * @since MU
- * @deprecated 3.0.0
- * @deprecated Use $GLOBALS['current_user']->ID
- */
-function get_current_user_id() {
-	_deprecated_function( __FUNCTION__, '3.0', '$GLOBALS[\'current_user\']->ID' );
-	return $GLOBALS['current_user']->ID;
-}
-
 /**
  * @since MU
  * @deprecated 3.0.0
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 932b4d6f54..733f0b8401 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -210,6 +210,20 @@ function user_pass_ok($user_login, $user_pass) {
 // User option functions
 //
 
+/**
+ * Get the current user's ID
+ * 
+ * @since MU
+ * 
+ * @uses wp_get_current_user
+ *
+ * @return int The current user's ID
+ */
+function get_current_user_id() {
+	$user = wp_get_current_user();
+	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
+}
+
 /**
  * Retrieve user option that can be either per Site or per Network.
  *