Revert "Re-use existing method to get split root"

This reverts commit 7f6f7aad7b26b62b9fdc765bd8be5d622386a666.
* Fix forward at ag/32331020

Bug: 399037701
Flag: EXEMPT bugfix

Change-Id: I48079ecb8232bc1026ba389cebe8ddf7d32b71f0
2 files changed