diff --git a/resources/sql/autopatches/20210316.almanac.07.binding-mailkey.php b/resources/sql/autopatches/20210316.almanac.07.binding-mailkey.php
new file mode 100644
index 0000000000..84c1725876
--- /dev/null
+++ b/resources/sql/autopatches/20210316.almanac.07.binding-mailkey.php
@@ -0,0 +1,28 @@
+<?php
+
+$binding_table = new AlmanacBinding();
+$binding_conn = $binding_table->establishConnection('w');
+
+$properties_table = new PhabricatorMetaMTAMailProperties();
+$conn = $properties_table->establishConnection('w');
+
+$iterator = new LiskRawMigrationIterator(
+  $binding_conn,
+  $binding_table->getTableName());
+
+foreach ($iterator as $row) {
+  queryfx(
+    $conn,
+    'INSERT IGNORE INTO %R
+        (objectPHID, mailProperties, dateCreated, dateModified)
+      VALUES
+        (%s, %s, %d, %d)',
+    $properties_table,
+    $row['phid'],
+    phutil_json_encode(
+      array(
+        'mailKey' => $row['mailKey'],
+      )),
+    PhabricatorTime::getNow(),
+    PhabricatorTime::getNow());
+}
diff --git a/resources/sql/autopatches/20210316.almanac.08.binding-dropmailkey.sql b/resources/sql/autopatches/20210316.almanac.08.binding-dropmailkey.sql
new file mode 100644
index 0000000000..ebcf31254d
--- /dev/null
+++ b/resources/sql/autopatches/20210316.almanac.08.binding-dropmailkey.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_almanac.almanac_binding
+  DROP mailKey;
diff --git a/src/applications/almanac/storage/AlmanacBinding.php b/src/applications/almanac/storage/AlmanacBinding.php
index a7096fc51f..011a085151 100644
--- a/src/applications/almanac/storage/AlmanacBinding.php
+++ b/src/applications/almanac/storage/AlmanacBinding.php
@@ -1,264 +1,257 @@
 <?php
 
 final class AlmanacBinding
   extends AlmanacDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorApplicationTransactionInterface,
     AlmanacPropertyInterface,
     PhabricatorDestructibleInterface,
     PhabricatorExtendedPolicyInterface,
     PhabricatorConduitResultInterface {
 
   protected $servicePHID;
   protected $devicePHID;
   protected $interfacePHID;
-  protected $mailKey;
   protected $isDisabled;
 
   private $service = self::ATTACHABLE;
   private $device = self::ATTACHABLE;
   private $interface = self::ATTACHABLE;
   private $almanacProperties = self::ATTACHABLE;
 
   public static function initializeNewBinding(AlmanacService $service) {
     return id(new AlmanacBinding())
       ->setServicePHID($service->getPHID())
       ->attachService($service)
       ->attachAlmanacProperties(array())
       ->setIsDisabled(0);
   }
 
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_COLUMN_SCHEMA => array(
-        'mailKey' => 'bytes20',
         'isDisabled' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_service' => array(
           'columns' => array('servicePHID', 'interfacePHID'),
           'unique' => true,
         ),
         'key_device' => array(
           'columns' => array('devicePHID'),
         ),
         'key_interface' => array(
           'columns' => array('interfacePHID'),
         ),
       ),
     ) + parent::getConfiguration();
   }
 
-  public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(AlmanacBindingPHIDType::TYPECONST);
-  }
-
-  public function save() {
-    if (!$this->mailKey) {
-      $this->mailKey = Filesystem::readRandomCharacters(20);
-    }
-    return parent::save();
+  public function getPHIDType() {
+    return AlmanacBindingPHIDType::TYPECONST;
   }
 
   public function getName() {
     return pht('Binding %s', $this->getID());
   }
 
   public function getURI() {
-    return '/almanac/binding/'.$this->getID().'/';
+    return urisprintf(
+      '/almanac/binding/%s/',
+      $this->getID());
   }
 
   public function getService() {
     return $this->assertAttached($this->service);
   }
 
   public function attachService(AlmanacService $service) {
     $this->service = $service;
     return $this;
   }
 
   public function getDevice() {
     return $this->assertAttached($this->device);
   }
 
   public function attachDevice(AlmanacDevice $device) {
     $this->device = $device;
     return $this;
   }
 
   public function hasInterface() {
     return ($this->interface !== self::ATTACHABLE);
   }
 
   public function getInterface() {
     return $this->assertAttached($this->interface);
   }
 
   public function attachInterface(AlmanacInterface $interface) {
     $this->interface = $interface;
     return $this;
   }
 
 
 /* -(  AlmanacPropertyInterface  )------------------------------------------- */
 
 
   public function attachAlmanacProperties(array $properties) {
     assert_instances_of($properties, 'AlmanacProperty');
     $this->almanacProperties = mpull($properties, null, 'getFieldName');
     return $this;
   }
 
   public function getAlmanacProperties() {
     return $this->assertAttached($this->almanacProperties);
   }
 
   public function hasAlmanacProperty($key) {
     $this->assertAttached($this->almanacProperties);
     return isset($this->almanacProperties[$key]);
   }
 
   public function getAlmanacProperty($key) {
     return $this->assertAttachedKey($this->almanacProperties, $key);
   }
 
   public function getAlmanacPropertyValue($key, $default = null) {
     if ($this->hasAlmanacProperty($key)) {
       return $this->getAlmanacProperty($key)->getFieldValue();
     } else {
       return $default;
     }
   }
 
   public function getAlmanacPropertyFieldSpecifications() {
     return $this->getService()->getBindingFieldSpecifications($this);
   }
 
   public function newAlmanacPropertyEditEngine() {
     return new AlmanacBindingPropertyEditEngine();
   }
 
   public function getAlmanacPropertySetTransactionType() {
     return AlmanacBindingSetPropertyTransaction::TRANSACTIONTYPE;
   }
 
   public function getAlmanacPropertyDeleteTransactionType() {
     return AlmanacBindingDeletePropertyTransaction::TRANSACTIONTYPE;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getService()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getService()->hasAutomaticCapability($capability, $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     $notes = array(
       pht('A binding inherits the policies of its service.'),
       pht(
         'To view a binding, you must also be able to view its device and '.
         'interface.'),
     );
 
     return $notes;
   }
 
 
 /* -(  PhabricatorExtendedPolicyInterface  )--------------------------------- */
 
 
   public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_EDIT:
         if ($this->getService()->isClusterService()) {
           return array(
             array(
               new PhabricatorAlmanacApplication(),
               AlmanacManageClusterServicesCapability::CAPABILITY,
             ),
           );
         }
         break;
     }
 
     return array();
   }
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
   public function getApplicationTransactionEditor() {
     return new AlmanacBindingEditor();
   }
 
   public function getApplicationTransactionTemplate() {
     return new AlmanacBindingTransaction();
   }
 
 
 /* -(  PhabricatorDestructibleInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->delete();
   }
 
 
 /* -(  PhabricatorConduitResultInterface  )---------------------------------- */
 
 
   public function getFieldSpecificationsForConduit() {
     return array(
       id(new PhabricatorConduitSearchFieldSpecification())
         ->setKey('servicePHID')
         ->setType('phid')
         ->setDescription(pht('The bound service.')),
       id(new PhabricatorConduitSearchFieldSpecification())
         ->setKey('devicePHID')
         ->setType('phid')
         ->setDescription(pht('The device the service is bound to.')),
       id(new PhabricatorConduitSearchFieldSpecification())
         ->setKey('interfacePHID')
         ->setType('phid')
         ->setDescription(pht('The interface the service is bound to.')),
       id(new PhabricatorConduitSearchFieldSpecification())
         ->setKey('disabled')
         ->setType('bool')
         ->setDescription(pht('Interface status.')),
     );
   }
 
   public function getFieldValuesForConduit() {
     return array(
       'servicePHID' => $this->getServicePHID(),
       'devicePHID' => $this->getDevicePHID(),
       'interfacePHID' => $this->getInterfacePHID(),
       'disabled' => (bool)$this->getIsDisabled(),
     );
   }
 
   public function getConduitSearchAttachments() {
     return array(
       id(new AlmanacPropertiesSearchEngineAttachment())
         ->setAttachmentKey('properties'),
     );
   }
 
 }