[TIMOB-17601] revert #6137 (3_4_X)
Merge pull request #6164 from skypanther/TIMOB-17601

[TIMOB-17601] revert #6137 (3_4_X)