Revert "Improve root_services performance"

This reverts commit ec973826d8a88255ccfda97306e2ea4ff3d92220.