This is a workaround for #18563. See #19042 for a follow-up task to remove
this workaround.