Adapt to 11.16.4's changes.