KRACOEUS-8614: reverting sprint 12