Revert "Use more robust null checker"

This reverts commit bd52305c954db703b4b6d608e2c92fbccd23b2f2.
Revert "Ensure group is managed when specifying the service_gid"

This reverts commit ceea0a19e9798d79b7a25246fc575733124ba692.