CURATOR-163 revert