Reverting commit 5960f4bfb6abd9a08c55589ffa8dbe9d79bfbc09

This was made in order to port https://jira.zenoss.com/browse/ZEN-13045 to Europa, but it ended up causing https://jira.zenoss.com/browse/ZEN-13474. Will reopen ZEN-13045; perhaps it's missing other code?