Small fix for the previous merge with upstream.