This reverts commit 6657246cd4. Reverting due to IP clearance issued for the commit done as part of CLOUDSTACK-312
6657246cd4