[TIMOB-17358]: Remove workaround