Remove obsolete email fixup code.

Orion 2.0 fixed the underlying problem.
#3759