Revert "Tool Labs: tweak to mail config"

This reverts commit 5812b8d52a193f6142637b3e83e4f65973aeeb66.

(Didn't work.  Darn.)

Change-Id: Ia57880ef39e790b4c4b8720b599737e826eb28d2
Merge "Revert "Tool Labs: tweak to mail config"" into production