Fixed in trust r116856..