Fixed on trunk via check-in [8e0bb4c6cd].