Actually it turns out that this variant scales better, so reverting the earlier change...