Revert "Upstream sync"

This reverts commit 41fa18d55997216cb4aaf632f70b91e4f6ab7fb7, reversing
changes made to e55a460cdc7018e8acc759a51e37b39c840ba13c.