CDI-389 Revert CDI-85
Merge pull request #198 from antoinesd/master

CDI-389 Revert CDI-85 also closes (again) CDI-389