This is now fixed by revision 107309