Revert to previous Bb as the new one breaks tests