Comment 9 for bug 1897920

Definitely option b) given the current timescales :) I'll upstream the minor packaging delta later this week (ref: comment 5), but unfortunately there's a couple of other release blockers I need to deal with first.