Fix up failed merge from the trunk: