revert something that shouldn't have been ported over to europa refs ZEN-14874
Merge pull request #469 from zenoss/feature/ZEN-14874

revert something that shouldn't have been ported over to europa refs ZEN...