vcs_email_refactor merge, effectively