Revert "HOTFIX for incoming mail failures; temporarily fixes gh-1344"
Revert "HOTFIX for incoming mail failures; temporarily fixes gh-1344"

This reverts commit 6adf15870b22cfe235fafdb32b0d68f0e93e80af.

sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms