[TIMOB-17601] revert #6136 (master)