is this still operative? Can you double check? It looks old, and if it is still a TODO, can we link to an issue?