Revert "Revert "Don't crash while adjusting sizes for the split""
This reverts commit 0f27e0e29d84d81e07ee81506d4671dbad925c0e.