Looked at the code here, and it seems like it's doing the right thing, so I'd opt to remove this TODO