Partial revert of the change in #102880, cherry-picked to 4.4.1. Co-authored-by: Pāvels Nadtočajevs <7645683+bruvzg@users.noreply.github.com>
Partial revert of the change in #102880, cherry-picked to 4.4.1. Co-authored-by: Pāvels Nadtočajevs <7645683+bruvzg@users.noreply.github.com>