This seems kludgy, can we fix this properly in the rootGuardian?