Fixed on trunk via check-in [57ef270232e1039f].