SONAR-3113 Revert on the Cloud Widget