Fix merge conflict with upstream.