So that this works on both email and web
Revert "So that this works on both email and web"

This reverts commit f5e0750c025364e1c18552742bf37a4663baa6be.