It seems we have enough agreement here. Let's just keep the old BQSR deleted in the topic branch. Once we're happy with the new BQSR and merge it with master, it'll be a nice atomic update. Out with the old, in with the new.