Revert "KRACOEUS-7114"

This reverts commit 641cdecead51fccc65dd2cc5cbac34188de88447.