Follow up recent upstream changes.