Revert "Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe"

This reverts commit c80c6ae1b3214a60e8ac5b19e8206334737e3af3.