Previously I refactored the data submodule to no longer support the
return_indices=True parameter, and instead expect you to wrap a Dataset
in the IndexedDataset class. I updated the tool improperly, by just
removing return_indices=True but not performing the wrapping. This
commit fixes that bug.