CDI-389 Revert CDI-85

Resolution of CDI-389 Revert CDI-85