Revert "Merge upstream changes"

This reverts commit 60fc9a775126a407214bb177ef1f663aba51769a.