Resolve @todo: when https://www.drupal.org/project/drupal/issues/2999549 * lands.