Revert "CLOUDSTACK-4649"

This reverts commit 5950d37e9f57a41a945a11724f250aaeffa9b118.