Revert "Merge pull request #14653 from fcampo/mms-forward-subject-941030"

This reverts commit cb6280606e1a306b13bb48e45fb3fcd940ff9f71.