CLOUDSTACK-6170
Revert "CLOUDSTACK-6170" due to unit test failure.

This reverts commit 50b5e2e247ebff54fda8c8c2cd4957ffd47bcf12.