This reverts commit 3266460749. This is the revert against master, the beta revert was already done in #100538.
3266460749