KRACOEUS-8443: Reverting changes