NUM-140

This time, without the rootGuardian :)