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

[TIMOB-17270] Reverting change.