Revert "Sync with upstream"

This reverts commit 8531ad32c540722eb7ba55852f732dbdfd955886.