Revert "Revert the split"

This reverts commit db41fe2af50d9f5d0ea9920b0fb1ca70960790e3.