Fix previous partial fix (#17429)

Commit

1 year ago

Fix previous partial fix (#17429) This is a bit unfortunate, but the best we can probably do. cc @hauntsaninja