I see the TODO now, but I can't find a related ticket. Am I missing it?