cc @BartWaardenburg -- I can't figure out why the linting was passing on `next` (perhaps you know why?) but it has started failing on `release/5.0` If there is a better fix, let me know