BUG 838005 - Revert email activity manifest changes