diff --git a/includes/phpmailer.class.inc b/includes/phpmailer.class.inc
index d2d5ce5..d055295 100644
--- a/includes/phpmailer.class.inc
+++ b/includes/phpmailer.class.inc
@@ -191,22 +191,6 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
   }
 
   /**
-   * Assemble the message header.
-   *
-   * PHPMailer always sets Return-Path to Sender, we want more flexibility.
-   */
-  public function CreateHeader() {
-    $old_sender = $this->Sender;
-    if ($this->ReturnPath != '') {
-      $this->Sender = $this->ReturnPath;
-    }
-    $result = parent::CreateHeader();
-    // Restore sender for use in MAIL FROM command.
-    $this->Sender = $old_sender;
-    return $result;
-  }
-
-  /**
    * Public wrapper around PHPMailer::RFCDate().
    */
   public static function RFCDate() {
@@ -324,9 +308,7 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
         'Content-Transfer-Encoding' => 'Encoding',
         'Sender'                    => 'Sender',
         'Message-ID'                => 'MessageID',
-        // Custom property.
-        // @see DrupalPHPMailer::CreateHeader()
-        'Return-Path'               => 'ReturnPath',
+        'Return-Path'               => 'Sender',
       );
       foreach ($properties as $source => $property) {
         if (isset($message['headers'][$source])) {