This TODO was added by Cale. I just moved it here from split.py