Nothing broken here actually, just missing info (shape needs at least three levels
of branching to take effect).

To be backported to 2.74.