Rolling back the old email setup