This should replace the need for https://github.com/mozilla/bugbug/pull/6289
This should replace the need for
#6289