did you decide to scrap the use_original_indices argument?