Adapt to 11.16.*.