Revert "Merge pull request #173 from ssvsergeyev/develop"

This reverts commit f9e9b56246de21cba9aa6e8493ced821c8dadd19, reversing
changes made to 946193277292fcb7944a40a66d9648143d5d88e4.
Merge pull request #174 from zenoss/revert_pull_request_173

Revert "Merge pull request #173 from ssvsergeyev/develop"