Replacing the patch from #18, removing the header block that prevents it from being applied
Updated patch for Drupal 10.1.0