ACCUMULO-3182 Fix incorrect fix at bad merge.