Update upstream. (Adjustments to hotfix.)