COMP: Undo experimental changes in DWIConvert