[TIMOB-17270] Reverting change.
Merge pull request #5902 from cb1kenobi/timob-17270

[TIMOB-17270] Reverting change.