Undo change to DWIConvert that needs to be its own patch