Adding a patch that uses Drupal's messenger method.