Adapt to changes in master.