This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e. Conflicts: server/src/com/cloud/api/ApiResponseHelper.java