[TIMOB-17724]: Revert TIMOB-15621.

Testing steps in JIRA