Revert "Rework split to pick first instead of really long name"

This reverts commit e892aa3a09625c14b7a1502e0cb63ea9a93bda0e.