I removed this line, because I often encountered the case where the From: address was being used when an email was sent to undisclosed-recipients (e.g. an email where all recipients were BCC'd).  Looks like other people may have encountered similar issues, e.g. 1953af76b79b18bff9870e7dba94471e59d37c33 in another fork.