This reverts commit b861ebb4. The current issues (See #54509 and #48828) are causing headaches to users of the unstable branches.