smtp_forward: back out w/s changes