Revert "Upstream Sync"

This reverts commit 23015d3ca4139ceabffc7f98889a1b688e1e9343, reversing
changes made to 2fbc9b7c921443c85018cda4ed148ea904e6c798.