Revert "More cosmetic fixes for enum_services"
Merge pull request #2 from chrisukgit/revert-1-pr3488_fix

Revert "More cosmetic fixes for enum_services"