[TIMOB-1510] Reinstated code accidentally deleted