Can kie-internal-uber-workaround be deleted alltogether?