Confirmed the fix above in https://www.drupal.org/node/2899231#comment-122441...