Bug #22567 has been fixed in SVN trunk now.