Revert regression introduced in #4104 (Fixes #4390)
Email cloak broken when link parameters are not parsed (Fix #4354)