Fixed with TIP 649 merge.