Revert "ZEN-7489: (PORT) ZEN-14658: If one instance of wrapped function ...

Reverts zenoss/zenoss-prodbin#513