Adapt to 15082b0 on unexpected v5.