WIP monkey patch for webhooks