Revert "Overcome bug CLOUDSTACK-2758"

The bug is now fixed.

This reverts commit b652250e1fd5ada83d1f022a3eec1ad85eed9471.