Revert "void, not int :)"

This reverts commit 3586edc8b848c955a768cd27350cf6ed71cd1ba6.
Revert "NMS-5776 make sure we have matching getter/setters, monitored service count is a no-op"

This reverts commit f74bfd5c76f67b5eddb4c5edbc5a30ec4c72559c.