Re-rolled the patch for Drupal10.1