I've started working on a patch here: http://core.trac.wordpress.org/ticket/10487 -- http://scribu.net