Revert "Merge pull request #22134 from lightsofapollo/revite-master"

This reverts commit 4f77cd1da2a20761673e1c159507f6720890b2cb, reversing
changes made to 4557e5387eab257f5dab5bcc4bdce7aa19cb5b30.