Revert r94289, r94290, r94294, r94333, r94345, r94362, r94370 -- core schema change...