Here's @beejeebus rolling a new CMI patch for #drupal