Fixing up old event firers
Merge pull request #8582 from techhat/cloudapi

Fixing up old event firers