Inline with upstream changes.