Drupal issue queue: https://www.drupal.org/project/drupal/issues/3069776#comment-14467718 The patch we used before was from MR and not the comment. Current file was renamed to comment #85. This is done so it is easier next time we need to update the patch.