KRACOEUS-6935: reverting changes, moving this work to 6.0