Revert "Add the logic to support the virtual root"