Bah, and of course there's a TODO comment I forgot to remove.

[originally from svn r5714]