CDI-389 Revert CDI-85