Actually, it looks like there's a simple change that needs to be made to fix it.

Related info:
http://core.trac.wordpress.org/ticket/14566
http://core.trac.wordpress.org/ticket/14629