Fixed on trunk via check-in [42082ffc4dd6d8e7].