d3a3cf1ff3
We never really took advantage of the potential extensibility that the split provided, and the boundary between the two was getting muddied over time.