This reverts commit f3b5a6ebc7. Reverting since a better fix is available with CLOUDSTACK-6478 (cherry picked from commit 9e7fbae52f)
f3b5a6ebc7
9e7fbae52f