Revert "Merged upstream changes"

This reverts commit bc5dc70410cfd750678cb9ac50c8b830dd932dcd.