KRACOEUS-6906: Reverting fix in order to reconsider some decisions.