9702e8a5fa
as I can't work out why it was needed, so I can't justify keeping it in the group calls merge. It should be PRed to develop separately if needed.