This reverts commit cdc632fbe6. Those changes are too significant and non-trivial to be suitable for a release branch at this time.
cdc632fbe6