diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 81944eda0e..05d9633181 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -1917,7 +1917,7 @@ function wp_insert_user( $userdata ) {
 	if ( ! empty( $userdata['ID'] ) ) {
 		$user_id       = (int) $userdata['ID'];
 		$update        = true;
-		$old_user_data = get_userdata( $user_id );
+		$old_user_data = new WP_User( $user_id );
 
 		if ( ! $old_user_data ) {
 			return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
@@ -2352,7 +2352,7 @@ function wp_update_user( $userdata ) {
 	}
 
 	// First, get all of the original fields.
-	$user_obj = get_userdata( $user_id );
+	$user_obj = new WP_User( $user_id );
 	if ( ! $user_obj ) {
 		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
 	}