Forgotten upstream changes.