Fixed a cloudEnabled/cloudWasEnabled cyclic dependency.