Belatedly apply merge fix.