This appears to have been fixed in revision 17049 by Jeff Altman.