Fix committed upstream.