Based on the feedback from Tony, here's the patch that flips around the clearing of cmc_polling_enabled.
Attach a file by drag & drop or click to upload
