Revert back MR !48354 (merged). Affects a number of reported rare crashes, e.g. ATR-24683, ATR-24634.