[TIMOB-17613]: Revert TIMOB-10837

Testing steps in JIRA