Revert "Include fully-qualified service name in equals check."

This reverts commit 0d03eba7fa1d9368caee2b025864829bd95f7ab1.