Revert the majority of the next patch in the address space series: