Revert "Synced with upstream"

This reverts commit 296c871b93b76cbc84d8a02b27074e6fcb9497e8, reversing
changes made to 70847c386fbde0609b027243f25c09fbd796d029.