CD-4043 : reverting a change.