Roll back to where email still works