Remove a TODO that turned out to be more trouble than it's worth.