fix something that was resolved improperly in the previous merge.