[TIMOB-13569] Added some code prematurely