[TIMOB-17601] revert #6136 (master)
Merge pull request #6165 from skypanther/TIMOB-17601b

[TIMOB-17601] revert #6136 (master)