Revert 05e58e8b ref. email