Revert "Merged with upstream updates"

This reverts commit f213bd47cbba2f37146a714a4b609a3580b4db45, reversing
changes made to b20be4b3f39c7bba4270dd0ad983e21c7b0413cf.