KRACOEUS-7197

Not a bad idea.