[TIMOB-14552] Revert

Reverts fixes from PR #4817